diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index a9e467132440..76b398963aee 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 3b874fc17488..947e223fb28f 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -34,6 +34,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 32d90fb6f4b5..92224d0bd92c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -123595,6 +123595,18 @@
      {}
     ]
    ],
+   "css/css-fonts/font-weight-xxx-large.html": [
+    [
+     "css/css-fonts/font-weight-xxx-large.html",
+     [
+      [
+       "/css/css-fonts/font-weight-xxx-large-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-fonts/matching/fixed-stretch-style-over-weight.html": [
     [
      "css/css-fonts/matching/fixed-stretch-style-over-weight.html",
@@ -246151,6 +246163,9 @@
    "css/css-fonts/font-weight-normal-001-ref.xht": [
     []
    ],
+   "css/css-fonts/font-weight-xxx-large-ref.html": [
+    []
+   ],
    "css/css-fonts/matching/META.yml": [
     []
    ],
@@ -311292,6 +311307,24 @@
      {}
     ]
    ],
+   "css/css-align/parsing/column-gap-computed.html": [
+    [
+     "css/css-align/parsing/column-gap-computed.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/column-gap-invalid.html": [
+    [
+     "css/css-align/parsing/column-gap-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/column-gap-valid.html": [
+    [
+     "css/css-align/parsing/column-gap-valid.html",
+     {}
+    ]
+   ],
    "css/css-align/parsing/justify-content-computed.html": [
     [
      "css/css-align/parsing/justify-content-computed.html",
@@ -311400,6 +311433,24 @@
      {}
     ]
    ],
+   "css/css-align/parsing/row-gap-computed.html": [
+    [
+     "css/css-align/parsing/row-gap-computed.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/row-gap-invalid.html": [
+    [
+     "css/css-align/parsing/row-gap-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-align/parsing/row-gap-valid.html": [
+    [
+     "css/css-align/parsing/row-gap-valid.html",
+     {}
+    ]
+   ],
    "css/css-align/self-alignment/parse-align-self-001.html": [
     [
      "css/css-align/self-alignment/parse-align-self-001.html",
@@ -317178,24 +317229,6 @@
      {}
     ]
    ],
-   "css/css-multicol/parsing/column-gap-computed.html": [
-    [
-     "css/css-multicol/parsing/column-gap-computed.html",
-     {}
-    ]
-   ],
-   "css/css-multicol/parsing/column-gap-invalid.html": [
-    [
-     "css/css-multicol/parsing/column-gap-invalid.html",
-     {}
-    ]
-   ],
-   "css/css-multicol/parsing/column-gap-valid.html": [
-    [
-     "css/css-multicol/parsing/column-gap-valid.html",
-     {}
-    ]
-   ],
    "css/css-multicol/parsing/column-rule-color-computed.html": [
     [
      "css/css-multicol/parsing/column-rule-color-computed.html",
@@ -535077,6 +535110,18 @@
    "25ea093b20997419f4d560d47cb9300d136d090e",
    "testharness"
   ],
+  "css/css-align/parsing/column-gap-computed.html": [
+   "01e04b04994ae61e1e94952f06757cc896ab75df",
+   "testharness"
+  ],
+  "css/css-align/parsing/column-gap-invalid.html": [
+   "181e004e7ca857444100513b0b82faeeddcc9648",
+   "testharness"
+  ],
+  "css/css-align/parsing/column-gap-valid.html": [
+   "4be3b50989f56de6d1209c196e6cb28cb2c2d151",
+   "testharness"
+  ],
   "css/css-align/parsing/justify-content-computed.html": [
    "b04d2db1429c385d57b9d6b232282d7924d6589b",
    "testharness"
@@ -535149,6 +535194,18 @@
    "36a8bd5026eab2870307c223028b499c02c92099",
    "testharness"
   ],
+  "css/css-align/parsing/row-gap-computed.html": [
+   "8108dcc63a1334bde0a8016fb88824a77949221d",
+   "testharness"
+  ],
+  "css/css-align/parsing/row-gap-invalid.html": [
+   "a51ab7425c488d2452e869f58d5165094934fd10",
+   "testharness"
+  ],
+  "css/css-align/parsing/row-gap-valid.html": [
+   "dacdd38254ddf1fac48d0530a0a2e5e650040a44",
+   "testharness"
+  ],
   "css/css-align/reference/baseline-of-scrollable-1-ref.html": [
    "422660aff6b6b486ce3288469b4769e1497b071e",
    "support"
@@ -548953,6 +549010,14 @@
    "21e70068f1876a9fc4cae1ec6ccc73be826063ae",
    "manual"
   ],
+  "css/css-fonts/font-weight-xxx-large-ref.html": [
+   "0cc1184a83a8d87edbaf0648e664dc1d9e1f0932",
+   "support"
+  ],
+  "css/css-fonts/font-weight-xxx-large.html": [
+   "327106668fdf7bc130112f3fee4968c21a1daea4",
+   "reftest"
+  ],
   "css/css-fonts/format-specifiers-variations.html": [
    "8caf2f3d6000a28c548c84a6fbe2d4c8de2ee5b7",
    "testharness"
@@ -561214,7 +561279,7 @@
    "testharness"
   ],
   "css/css-multicol/inheritance.html": [
-   "58e7a92669efad79a336b7342362290595bab874",
+   "e7938d3e9ffa2d21c57e4565283911431e56f17e",
    "testharness"
   ],
   "css/css-multicol/inline-block-and-column-span-all.html": [
@@ -562661,18 +562726,6 @@
    "ad5913d0bc0e77a8aa6e2937d5eebf47a348391a",
    "testharness"
   ],
-  "css/css-multicol/parsing/column-gap-computed.html": [
-   "d0f88d43b56efc85ed47e987f8429680ec321303",
-   "testharness"
-  ],
-  "css/css-multicol/parsing/column-gap-invalid.html": [
-   "8ec92df6c4be54f272c1bfffd8f71ad8372aca45",
-   "testharness"
-  ],
-  "css/css-multicol/parsing/column-gap-valid.html": [
-   "96ae68ee08813462c0eb9cb0d33d765fad376e0d",
-   "testharness"
-  ],
   "css/css-multicol/parsing/column-rule-color-computed.html": [
    "d5cc24075114d158871dba9f9236ee4103d1e4c7",
    "testharness"
diff --git a/tests/wpt/metadata/css/css-align/parsing/column-gap-computed.html.ini b/tests/wpt/metadata/css/css-align/parsing/column-gap-computed.html.ini
new file mode 100644
index 000000000000..1ac6a8db6fef
--- /dev/null
+++ b/tests/wpt/metadata/css/css-align/parsing/column-gap-computed.html.ini
@@ -0,0 +1,16 @@
+[column-gap-computed.html]
+  [Property column-gap value '40%' computes to '40%']
+    expected: FAIL
+
+  [Property column-gap value 'calc(50% + 60px)' computes to 'calc(50% + 60px)']
+    expected: FAIL
+
+  [Property column-gap value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property column-gap value 'calc(10px + 0.5em)' computes to '30px']
+    expected: FAIL
+
+  [Property column-gap value 'calc(10px - 0.5em)' computes to '0px']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-align/parsing/column-gap-valid.html.ini b/tests/wpt/metadata/css/css-align/parsing/column-gap-valid.html.ini
new file mode 100644
index 000000000000..8435e2dddbe4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-align/parsing/column-gap-valid.html.ini
@@ -0,0 +1,19 @@
+[column-gap-valid.html]
+  [e.style['column-gap'\] = "1px" should set the property value]
+    expected: FAIL
+
+  [e.style['column-gap'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['column-gap'\] = "calc(2em + 3ex)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-gap'\] = "4%" should set the property value]
+    expected: FAIL
+
+  [e.style['column-gap'\] = "5vmin" should set the property value]
+    expected: FAIL
+
+  [e.style['column-gap'\] = "normal" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-align/parsing/row-gap-computed.html.ini b/tests/wpt/metadata/css/css-align/parsing/row-gap-computed.html.ini
new file mode 100644
index 000000000000..076774827b97
--- /dev/null
+++ b/tests/wpt/metadata/css/css-align/parsing/row-gap-computed.html.ini
@@ -0,0 +1,19 @@
+[row-gap-computed.html]
+  [Property row-gap value '10px' computes to '10px']
+    expected: FAIL
+
+  [Property row-gap value 'calc(20% + 10px)' computes to 'calc(20% + 10px)']
+    expected: FAIL
+
+  [Property row-gap value '20%' computes to '20%']
+    expected: FAIL
+
+  [Property row-gap value 'normal' computes to 'normal']
+    expected: FAIL
+
+  [Property row-gap value 'calc(0.5em + 10px)' computes to '30px']
+    expected: FAIL
+
+  [Property row-gap value 'calc(-0.5em + 10px)' computes to '0px']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-align/parsing/row-gap-valid.html.ini b/tests/wpt/metadata/css/css-align/parsing/row-gap-valid.html.ini
new file mode 100644
index 000000000000..93d66432e516
--- /dev/null
+++ b/tests/wpt/metadata/css/css-align/parsing/row-gap-valid.html.ini
@@ -0,0 +1,16 @@
+[row-gap-valid.html]
+  [e.style['row-gap'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['row-gap'\] = "calc(20% + 10px)" should set the property value]
+    expected: FAIL
+
+  [e.style['row-gap'\] = "10px" should set the property value]
+    expected: FAIL
+
+  [e.style['row-gap'\] = "20%" should set the property value]
+    expected: FAIL
+
+  [e.style['row-gap'\] = "0" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/font-weight-xxx-large.html.ini b/tests/wpt/metadata/css/css-fonts/font-weight-xxx-large.html.ini
new file mode 100644
index 000000000000..86fcb0cf546a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-weight-xxx-large.html.ini
@@ -0,0 +1,2 @@
+[font-weight-xxx-large.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
index 5d20389c8e9f..40dc50bd5e74 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-001.html.ini
@@ -56,3 +56,9 @@
   [background-position length(px) / events]
     expected: FAIL
 
+  [font-size length(em) / values]
+    expected: FAIL
+
+  [font-size length(em) / events]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
index 8850ec200da2..2178309df751 100644
--- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
@@ -71,6 +71,3 @@
   [text-indent intermediate]
     expected: FAIL
 
-  [opacity end]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e2743..000000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index f7879936446b..c5e7dd9675dd 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,21 +312,3 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index c7413d589dc1..5c0015928591 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -59,6 +59,3 @@
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 536384f36e1c..a639f15230c4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e6704..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321e..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc19..000000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
index bf50d59df415..e02f179ec250 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-innerwidth-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `innerwidth`, `innerheight`]
     expected: FAIL
 
+  [features "innerheight=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
index e150c9d848f1..23eefb8eaf96 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-screenx-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `screenx`, `screeny`]
     expected: FAIL
 
+  [features "screenx=-204" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204.5" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-0" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-0" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-204.5" should NOT set "left=204"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
index ad8840fbb68b..940516ddd336 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-top-left.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-top-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `top`, `left`]
     expected: FAIL
 
+  [features "top=-204" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "top=-204.5" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "left=-204" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "top=-0" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "left=-204.5" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "left=-0" should NOT set "left=204"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
index d1ed9088b2b5..9027336b4532 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-width-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `width`, `height`]
     expected: FAIL
 
+  [features "height=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "width=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
index a70e9dbad4d8..4e44584b123a 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `height`]
     expected: FAIL
 
   [features "height=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "height=/404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,width=401,: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [features "height=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=L404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
index 779531b4a989..fcaeae5336d9 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerheight`]
     expected: FAIL
 
   [features "innerheight=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerheight=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
index 7a1b258d52e7..42327fedd27b 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerwidth.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerwidth`]
     expected: FAIL
 
   [features "innerwidth=405e-1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405*3" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405e1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.32" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405  " should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405LLl" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405/5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405^4" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerwidth=/404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=_404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=L404" should NOT set "width=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
index caba4124f0b4..a8e4fe06618c 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `left`]
     expected: FAIL
 
   [features "left=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "left=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=/104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=_104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
index 9ace8a4cbdbb..64a08faf0e60 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screenx.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screenx`]
     expected: FAIL
 
   [features "screenx=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screenx=_104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=/104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
index a82bd0f981ac..4f22ef4ef29f 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screeny`]
     expected: FAIL
 
   [features "screeny=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screeny=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
index 28f93ee71b5d..9d841e61bc00 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-width.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `width`]
     expected: FAIL
 
   [features "width=405^4" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405.5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405e1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405  " should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405.32" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405LLl" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405*3" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405e-1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "width=405/5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "width" should be treated same as "width=0"]
+    expected: TIMEOUT
+
+  [features "width=_404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,height=401,: absence of feature "width" should be treated same as "width=0"]
+    expected: TIMEOUT
+
+  [features "width=/404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=L404" should NOT set "width=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
deleted file mode 100644
index 8cc42056d34e..000000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[non-active-document.html]
-  [DOMParser]
-    expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
index 127392316de4..702af61a3c4c 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
@@ -1,7 +1,11 @@
 [form-submission-algorithm.html]
+  expected: TIMEOUT
   [If form's firing submission events is true, then return; 'submit' event]
     expected: FAIL
 
   [If form's firing submission events is true, then return; 'invalid' event]
     expected: FAIL
 
+  [Cannot navigate (after constructing the entry list)]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
deleted file mode 100644
index 9e522297c94d..000000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d146..000000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
deleted file mode 100644
index 6cf9d13975c8..000000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_005.html]
-  [document.write external script into iframe write back into parent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini b/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
index 494f0d4a752f..aa36a14c6a6b 100644
--- a/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
+++ b/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
@@ -20,3 +20,6 @@
   [domainLookupStart should be 0 in cross-origin request.]
     expected: FAIL
 
+  [responseEnd should be greater than 0 in cross-origin request.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 6f05d1ae314a..db4b28e96192 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -188,3 +188,6 @@
   [X SNR (21.44058247864935 dB) is not greater than or equal to 65.737. Got 21.44058247864935.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t9.4836157560348511e-1\t9.5236867666244507e-1\t4.0071010589599609e-3\t4.2075103446311962e-3\t3.8985999999999999e-3\n\t[31\]\t9.2646563053131104e-1\t9.3139332532882690e-1\t4.9276947975158691e-3\t5.2906700783754857e-3\t3.8985999999999999e-3\n\t[32\]\t9.0087991952896118e-1\t9.0675884485244751e-1\t5.8789253234863281e-3\t6.4834496590358351e-3\t3.8985999999999999e-3\n\t[33\]\t8.7170630693435669e-1\t8.7856203317642212e-1\t6.8557262420654297e-3\t7.8033490899654511e-3\t3.8985999999999999e-3\n\t[34\]\t8.3906102180480957e-1\t8.4691369533538818e-1\t7.8526735305786133e-3\t9.2721059699818163e-3\t3.8985999999999999e-3\n\t...and 31037 more errors.\n\tMax AbsError of 9.8276454210281372e-1 at index of 39267.\n\t[39267\]\t-2.1306337878227066e-23\t-9.8276454210281372e-1\t9.8276454210281372e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\tMax RelError of 3.3137802965303198e+0 at index of 1253.\n\t[1253\]\t-4.3022233992815018e-2\t-9.9732093513011932e-3\t3.3049024641513824e-2\t3.3137802965303198e+0\t3.8985999999999999e-3\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini b/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
index 3b9d2fd022d2..a72d1e558a6c 100644
--- a/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
@@ -38,9 +38,6 @@
   [test_no_browsing_context]
     expected: ERROR
 
-  [test_height_width_larger_than_max]
-    expected: FAIL
-
   [test_negative_x_y]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index fe8654e447c7..000000000000
--- a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
new file mode 100644
index 000000000000..dbea4f293ad0
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
@@ -0,0 +1,2 @@
+[transition_calc_implicit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-computed.html b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-computed.html
similarity index 81%
rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-computed.html
rename to tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-computed.html
index d0f88d43b56e..01e04b04994a 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-computed.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: getComputedStyle().columnGap</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: getComputedStyle().columnGap</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap computed value is as specified.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-invalid.html b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-invalid.html
similarity index 80%
rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-invalid.html
rename to tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-invalid.html
index 8ec92df6c4be..181e004e7ca8 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-invalid.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: parsing column-gap with invalid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: parsing column-gap with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap supports only the grammar '<length-percentage> | normal'.">
 <meta name="assert" content="column-gap rejects negative <length-percentage>.">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-valid.html b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-valid.html
similarity index 79%
rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-valid.html
rename to tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-valid.html
index 96ae68ee0881..4be3b50989f5 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-gap-valid.html
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-valid.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>CSS Multi-column Layout: parsing column-gap with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#propdef-column-gap">
+<title>CSS Box Alignment Level 3: parsing column-gap with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-column-gap">
 <meta name="assert" content="column-gap supports the full grammar '<length-percentage> | normal'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-computed.html b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-computed.html
new file mode 100644
index 000000000000..8108dcc63a13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-computed.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Box Alignment Level 3: getComputedStyle().rowGap</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-row-gap">
+<meta name="assert" content="row-gap computed value is a specified keyword or a computed <length-percentage>.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("row-gap", "normal");
+
+test_computed_value("row-gap", "10px");
+test_computed_value("row-gap", "20%");
+test_computed_value("row-gap", "calc(20% + 10px)");
+
+test_computed_value("row-gap", "calc(-0.5em + 10px)", "0px");
+test_computed_value("row-gap", "calc(0.5em + 10px)", "30px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-invalid.html b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-invalid.html
new file mode 100644
index 000000000000..a51ab7425c48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Box Alignment Level 3: parsing row-gap with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-row-gap">
+<meta name="assert" content="row-gap supports only the grammar 'normal | <length-percentage>'.">
+<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("row-gap", "auto");
+test_invalid_value("row-gap", "-10px");
+
+test_invalid_value("row-gap", "10px 20%");
+test_invalid_value("row-gap", "normal 10px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-valid.html b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-valid.html
new file mode 100644
index 000000000000..dacdd38254dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-valid.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Box Alignment Level 3: parsing row-gap with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-row-gap">
+<meta name="assert" content="row-gap supports the full grammar 'normal | <length-percentage>'.">
+<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("row-gap", "normal");
+
+test_valid_value("row-gap", "10px");
+test_valid_value("row-gap", "20%");
+test_valid_value("row-gap", "calc(20% + 10px)");
+test_valid_value("row-gap", "0", "0px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large-ref.html
new file mode 100644
index 000000000000..0cc1184a83a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-size: xxx-large; size equivalence</title>
+<link rel="author" title="Joel Olsson" href="joel_1st@hotmail.com">
+<body>
+<p>Test passes if the line below is identical, with matching font size.</p>
+<font size=7>Foo</font>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large.html b/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large.html
new file mode 100644
index 000000000000..327106668fdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-weight-xxx-large.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test:  font-size: xxx-large; size equivalence</title>
+<link rel="author" title="Joel Olsson" href="joel_1st@hotmail.com">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-size-prop">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#absolute-size-mapping">
+<link rel="match" href="font-weight-xxx-large-ref.html">
+<body>
+<p>Test passes if the line below is identical, with matching font size.</p>
+<span style="font-size: xxx-large">Foo</span>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/inheritance.html b/tests/wpt/web-platform-tests/css/css-multicol/inheritance.html
index 58e7a92669ef..e7938d3e9ffa 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/inheritance.html
+++ b/tests/wpt/web-platform-tests/css/css-multicol/inheritance.html
@@ -34,7 +34,6 @@
 
 assert_not_inherited('column-count', 'auto', '2');
 assert_not_inherited('column-fill', 'balance', 'auto');
-assert_not_inherited('column-gap', 'normal', '10px');
 assert_not_inherited('column-rule-color', 'rgba(42, 53, 64, 0.75)', 'rgba(2, 3, 5, 0.5)');
 assert_not_inherited('column-rule-style', 'none', 'dashed');
 assert_not_inherited('column-rule-width', mediumWidth, '10px');