diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index 08ab7bd35cd..00000000000
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 39069192147..66a6e016faa 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -5,8 +5,5 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
deleted file mode 100644
index b4eea326212..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-001.html]
-  [block-in-inline-hittest-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 171f113d587..b8d071dc217 100644
--- a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -305,8 +305,17 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
+
+  [Matching font-weight: '501' should prefer '502 510' over '503 520']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '105%' over '100%']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 15deg 20deg' over 'oblique 30deg 60deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index 73c4b4ace57..76b228a7e24 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -352,3 +352,135 @@
 
   [text-shadow shadow(shadow) / values]
     expected: FAIL
+
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-002.html.ini
index d34dc5456ba..ce3251ad5da 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-002.html.ini
@@ -1,3 +1,27 @@
 [properties-value-002.html]
   [vertical-align vertical(keyword) / values]
     expected: FAIL
+
+  [margin-bottom percentage(%) / values]
+    expected: FAIL
+
+  [margin-left percentage(%) / values]
+    expected: FAIL
+
+  [margin-right percentage(%) / values]
+    expected: FAIL
+
+  [margin-top percentage(%) / values]
+    expected: FAIL
+
+  [padding-bottom percentage(%) / values]
+    expected: FAIL
+
+  [padding-left percentage(%) / values]
+    expected: FAIL
+
+  [padding-right percentage(%) / values]
+    expected: FAIL
+
+  [padding-top percentage(%) / values]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..7e9331b6bc2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini
new file mode 100644
index 00000000000..db065588308
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-table.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-table.html]
+  [float-in-div]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
index 2b915688f6e..7263c5e7c2a 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -14,5 +14,11 @@
   [<li>Outside 1</li>]
     expected: FAIL
 
-  [<li>Inside 2</li>]
+  [<li>Inside 1</li>]
+    expected: FAIL
+
+  [<li>Image Inside 1</li>]
+    expected: FAIL
+
+  [<li>Image Inside 2</li>]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
new file mode 100644
index 00000000000..8f6f663ba61
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-subpixel.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-subpixel.html]
+  [Hit test top left corner of box]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
deleted file mode 100644
index a6bca7ac372..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-visibility-hidden-resizer.html]
-  [elementFromPoint on resizer area of an element with visibility:hidden]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index a3496a40d07..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
new file mode 100644
index 00000000000..00753fab1d1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
@@ -0,0 +1,6 @@
+[offsetTopLeft-border-box.html]
+  [container: 0]
+    expected: FAIL
+
+  [container: 1]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
index ac656410273..959ec1fd02b 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-length/parsing.window.js.ini
@@ -77,8 +77,5 @@
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
 
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
-    expected: FAIL
-
-  [Input: "Content-Length: 30". Expected: 30.]
+  [Input: "Content-Length: 42\\r\\nContent-Length: 42,42". Expected: 42.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 0d48169e3cc..f9de5391ad6 100644
--- a/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,6 +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
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 4c2d4e41a14..736ff6130a5 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -7,6 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
index 1f528be38ef..a3f473a9557 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -1,4 +1,4 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
-  expected: ERROR
+  expected: TIMEOUT
   [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
index f2dee7b3ea9..54e2e5293bc 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
@@ -1,6 +1,7 @@
 [consecutive-srcdoc.html]
+  expected: TIMEOUT
   [changing srcdoc does a replace navigation since the URL is still about:srcdoc]
-    expected: FAIL
+    expected: TIMEOUT
 
   [changing srcdoc to about:srcdoc#yo then another srcdoc does two push navigations and we can navigate back]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index c5fc1407992..1bca09f21d6 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,5 +1,4 @@
 [iframe-src-aboutblank-navigate-immediately.html]
-  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
@@ -7,4 +6,4 @@
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index c07cbe00d9b..8298274f967 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -7,6 +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
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index d96b182328a..d70c1bd7ef5 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -1,19 +1,10 @@
 [javascript-url-no-beforeunload.window.html]
   expected: TIMEOUT
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: NOTRUN
+    expected: FAIL
 
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: string completion]
     expected: NOTRUN
-
-  [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: undefined completion]
-    expected: TIMEOUT
-
-  [Navigating an iframe via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: NOTRUN
-
-  [Navigating an iframe via src="" to a javascript: URL after insertion must not fire beforeunload: string completion]
-    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
index 5a245d61359..bcda478adb1 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
@@ -1,6 +1,10 @@
 [javascript-url-referrer.window.html]
+  expected: TIMEOUT
   [unsafe-url referrer policy used to create the starting page]
     expected: FAIL
 
   [origin referrer policy used to create the starting page]
     expected: FAIL
+
+  [no-referrer referrer policy used to create the starting page]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..b169452e04a 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -10,12 +10,3 @@
 
   [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/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
index e84cccbbd1f..6c777ea167c 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
@@ -1,3 +1,4 @@
 [form-submit-button-click.html]
+  expected: TIMEOUT
   [Replace before load, triggered by submitButton.click()]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
index 16371ab858d..f18f914e4a4 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
@@ -1,4 +1,3 @@
 [form-submit.html]
-  expected: TIMEOUT
   [Replace before load, triggered by formElement.submit()]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..4b4820d1729
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,3 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 4034793cc72..c6f1e5d7d84 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index ff6467094b8..d5fd800f09d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
index 31745fdcdcf..31928ad3947 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
@@ -1,4 +1,5 @@
 [sandbox-top-navigation-child-special-cases.tentative.sub.window.html]
+  expected: TIMEOUT
   [Allow top with user activation + user activation]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 47b45e65a1c..3cdeb8ebcbc 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,9 +1,3 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
deleted file mode 100644
index e06eefccd67..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[select-event.html]
-  [input type text: setSelectionRange() event queue]
-    expected: FAIL
-
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd event queue]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index a88d2c8f411..dcd52d2fee8 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,5 +1,4 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
@@ -7,7 +6,7 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
deleted file mode 100644
index 2212b9d731f..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[async-script.html?reload]
-  expected: ERROR
-
-[async-script.html]
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 1053fb90051..6206f8c0210 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -2,6 +2,3 @@
   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/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index dbe1def99e3..6dcac6f75ac 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,4 +1,5 @@
 [promise-job-entry-different-function-realm.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
@@ -12,4 +13,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
index 39d039a0132..04c2032c723 100644
--- a/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
@@ -1,5 +1,5 @@
 [cross-partition.https.tentative.html]
-  expected: CRASH
+  expected: TIMEOUT
   [BroadcastChannel messages aren't received from a cross-partition iframe]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/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/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..b7b36c1d3a4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/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/metadata/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
deleted file mode 100644
index 08ab7bd35cd..00000000000
--- a/tests/wpt/metadata/FileAPI/url/url-charset.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[url-charset.window.html]
-  expected: TIMEOUT
-  [Blob charset should override any auto-detected charset.]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index a057f038339..5e3a96e5999 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,8 +8,5 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
deleted file mode 100644
index b4eea326212..00000000000
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-in-inline-hittest-001.html]
-  [block-in-inline-hittest-001]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
index 51432362d66..ee34bc91078 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-002.html.ini
@@ -1,3 +1,6 @@
 [block-in-inline-hittest-002.html]
   [elementsFromPoint]
     expected: FAIL
+
+  [elementFromPoint]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 25831b9b25d..74b357725fa 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -314,8 +314,17 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -10deg' over 'italic']
     expected: FAIL
+
+  [Matching font-weight: '501' should prefer '502 510' over '503 520']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '105%' over '100%']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 10deg' should prefer 'oblique 15deg 20deg' over 'oblique 30deg 60deg']
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index 73c4b4ace57..76b228a7e24 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -352,3 +352,135 @@
 
   [text-shadow shadow(shadow) / values]
     expected: FAIL
+
+  [background-color color(rgba) / values]
+    expected: FAIL
+
+  [border-top-width length(pt) / values]
+    expected: FAIL
+
+  [border-top-width length(pc) / values]
+    expected: FAIL
+
+  [border-top-width length(px) / values]
+    expected: FAIL
+
+  [border-top-width length(em) / values]
+    expected: FAIL
+
+  [border-top-width length(ex) / values]
+    expected: FAIL
+
+  [border-top-width length(mm) / values]
+    expected: FAIL
+
+  [border-top-width length(cm) / values]
+    expected: FAIL
+
+  [border-top-width length(in) / values]
+    expected: FAIL
+
+  [border-right-width length(pt) / values]
+    expected: FAIL
+
+  [border-right-width length(pc) / values]
+    expected: FAIL
+
+  [border-right-width length(px) / values]
+    expected: FAIL
+
+  [border-right-width length(em) / values]
+    expected: FAIL
+
+  [border-right-width length(ex) / values]
+    expected: FAIL
+
+  [border-right-width length(mm) / values]
+    expected: FAIL
+
+  [border-right-width length(cm) / values]
+    expected: FAIL
+
+  [border-right-width length(in) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pt) / values]
+    expected: FAIL
+
+  [border-bottom-width length(pc) / values]
+    expected: FAIL
+
+  [border-bottom-width length(px) / values]
+    expected: FAIL
+
+  [border-bottom-width length(em) / values]
+    expected: FAIL
+
+  [border-bottom-width length(ex) / values]
+    expected: FAIL
+
+  [border-bottom-width length(mm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(cm) / values]
+    expected: FAIL
+
+  [border-bottom-width length(in) / values]
+    expected: FAIL
+
+  [border-left-width length(pt) / values]
+    expected: FAIL
+
+  [border-left-width length(pc) / values]
+    expected: FAIL
+
+  [border-left-width length(px) / values]
+    expected: FAIL
+
+  [border-left-width length(em) / values]
+    expected: FAIL
+
+  [border-left-width length(ex) / values]
+    expected: FAIL
+
+  [border-left-width length(mm) / values]
+    expected: FAIL
+
+  [border-left-width length(cm) / values]
+    expected: FAIL
+
+  [border-left-width length(in) / values]
+    expected: FAIL
+
+  [border-top-color color(rgba) / values]
+    expected: FAIL
+
+  [border-right-color color(rgba) / values]
+    expected: FAIL
+
+  [border-bottom-color color(rgba) / values]
+    expected: FAIL
+
+  [border-left-color color(rgba) / values]
+    expected: FAIL
+
+  [padding-bottom length(pt) / values]
+    expected: FAIL
+
+  [padding-bottom length(pc) / values]
+    expected: FAIL
+
+  [padding-bottom length(px) / values]
+    expected: FAIL
+
+  [padding-bottom length(em) / values]
+    expected: FAIL
+
+  [margin-top length(px) / values]
+    expected: FAIL
+
+  [height length(px) / values]
+    expected: FAIL
+
+  [width length(px) / values]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-002.html.ini
index d34dc5456ba..ce3251ad5da 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-002.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-002.html.ini
@@ -1,3 +1,27 @@
 [properties-value-002.html]
   [vertical-align vertical(keyword) / values]
     expected: FAIL
+
+  [margin-bottom percentage(%) / values]
+    expected: FAIL
+
+  [margin-left percentage(%) / values]
+    expected: FAIL
+
+  [margin-right percentage(%) / values]
+    expected: FAIL
+
+  [margin-top percentage(%) / values]
+    expected: FAIL
+
+  [padding-bottom percentage(%) / values]
+    expected: FAIL
+
+  [padding-left percentage(%) / values]
+    expected: FAIL
+
+  [padding-right percentage(%) / values]
+    expected: FAIL
+
+  [padding-top percentage(%) / values]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..7e9331b6bc2
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini
new file mode 100644
index 00000000000..db065588308
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-table.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-float-in-table.html]
+  [float-in-div]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
index 8425141b736..ffb1e67ea2f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -14,5 +14,11 @@
   [<li>Outside 3</li>]
     expected: FAIL
 
-  [<li>Inside 2</li>]
+  [<li>Inside 1</li>]
+    expected: FAIL
+
+  [<li>Image Inside 1</li>]
+    expected: FAIL
+
+  [<li>Image Inside 2</li>]
     expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
new file mode 100644
index 00000000000..8f6f663ba61
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-subpixel.html]
+  [Hit test top left corner of box]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
deleted file mode 100644
index a6bca7ac372..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-visibility-hidden-resizer.html]
-  [elementFromPoint on resizer area of an element with visibility:hidden]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index a3496a40d07..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
new file mode 100644
index 00000000000..00753fab1d1
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
@@ -0,0 +1,6 @@
+[offsetTopLeft-border-box.html]
+  [container: 0]
+    expected: FAIL
+
+  [container: 1]
+    expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
index ac656410273..959ec1fd02b 100644
--- a/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-length/parsing.window.js.ini
@@ -77,8 +77,5 @@
   [Input: "Content-Length: ". Expected: 42.]
     expected: FAIL
 
-  [Input: "Content-Length: 42\\r\\nContent-Length: 42". Expected: 42.]
-    expected: FAIL
-
-  [Input: "Content-Length: 30". Expected: 30.]
+  [Input: "Content-Length: 42\\r\\nContent-Length: 42,42". Expected: 42.]
     expected: FAIL
diff --git a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 0d48169e3cc..f9de5391ad6 100644
--- a/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,6 +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
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 4c2d4e41a14..736ff6130a5 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -7,6 +7,3 @@
 
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
index c8a3c8f9e68..6e9f7acf151 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html.ini
@@ -1,6 +1,6 @@
 [scroll-restoration-fragment-scrolling-cross-origin.html]
   type: testharness
-  expected: ERROR
+  expected: TIMEOUT
   [Manual scroll restoration should take precedent over scrolling to fragment in cross origin navigation]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
index f2dee7b3ea9..54e2e5293bc 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
@@ -1,6 +1,7 @@
 [consecutive-srcdoc.html]
+  expected: TIMEOUT
   [changing srcdoc does a replace navigation since the URL is still about:srcdoc]
-    expected: FAIL
+    expected: TIMEOUT
 
   [changing srcdoc to about:srcdoc#yo then another srcdoc does two push navigations and we can navigate back]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index c5fc1407992..1bca09f21d6 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,5 +1,4 @@
 [iframe-src-aboutblank-navigate-immediately.html]
-  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
@@ -7,4 +6,4 @@
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index c07cbe00d9b..8298274f967 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -7,6 +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
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
index d96b182328a..d70c1bd7ef5 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js.ini
@@ -1,19 +1,10 @@
 [javascript-url-no-beforeunload.window.html]
   expected: TIMEOUT
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: undefined completion]
-    expected: NOTRUN
+    expected: FAIL
 
   [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Navigating an opened window with an iframe via location.href to a javascript: URL must not fire beforeunload on the iframe: string completion]
     expected: NOTRUN
-
-  [Navigating an opened window via location.href to a javascript: URL must not fire beforeunload: undefined completion]
-    expected: TIMEOUT
-
-  [Navigating an iframe via location.href to a javascript: URL must not fire beforeunload: string completion]
-    expected: NOTRUN
-
-  [Navigating an iframe via src="" to a javascript: URL after insertion must not fire beforeunload: string completion]
-    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
index 5a245d61359..bcda478adb1 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js.ini
@@ -1,6 +1,10 @@
 [javascript-url-referrer.window.html]
+  expected: TIMEOUT
   [unsafe-url referrer policy used to create the starting page]
     expected: FAIL
 
   [origin referrer policy used to create the starting page]
     expected: FAIL
+
+  [no-referrer referrer policy used to create the starting page]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 8ae58f9f1e2..b169452e04a 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -10,12 +10,3 @@
 
   [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/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
index e84cccbbd1f..6c777ea167c 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html.ini
@@ -1,3 +1,4 @@
 [form-submit-button-click.html]
+  expected: TIMEOUT
   [Replace before load, triggered by submitButton.click()]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
index 16371ab858d..f18f914e4a4 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html.ini
@@ -1,4 +1,3 @@
 [form-submit.html]
-  expected: TIMEOUT
   [Replace before load, triggered by formElement.submit()]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..4b4820d1729
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,3 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 6bec7a732b8..76e34322dca 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index ff6467094b8..d5fd800f09d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
index 31745fdcdcf..31928ad3947 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
@@ -1,4 +1,5 @@
 [sandbox-top-navigation-child-special-cases.tentative.sub.window.html]
+  expected: TIMEOUT
   [Allow top with user activation + user activation]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 47b45e65a1c..3cdeb8ebcbc 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,9 +1,3 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
deleted file mode 100644
index e06eefccd67..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[select-event.html]
-  [input type text: setSelectionRange() event queue]
-    expected: FAIL
-
-  [input type text: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionEnd event queue]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index d1c8dee6d6d..cc18f512574 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -11,7 +10,7 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
deleted file mode 100644
index 1181798bd79..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/defer-script/async-script.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[async-script.html]
-
-[async-script.html?reload]
-  expected: ERROR
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index e55f8f2ce3c..8845054116d 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   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/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index dbe1def99e3..6dcac6f75ac 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,4 +1,5 @@
 [promise-job-entry-different-function-realm.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
@@ -12,4 +13,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 1d71471b73c..4a48dd15a9d 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,7 +1,6 @@
 [promise-rejection-events.html]
-  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
-    expected: TIMEOUT
+    expected: FAIL
 
   [unhandledrejection: from createImageBitmap which is UA triggered]
     expected: FAIL
diff --git a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
index 39d039a0132..04c2032c723 100644
--- a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
+++ b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
@@ -1,5 +1,5 @@
 [cross-partition.https.tentative.html]
-  expected: CRASH
+  expected: TIMEOUT
   [BroadcastChannel messages aren't received from a cross-partition iframe]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/metadata/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/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..b7b36c1d3a4
--- /dev/null
+++ b/tests/wpt/metadata/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/mozilla/meta/mozilla/scrollBy.html.ini b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
new file mode 100644
index 00000000000..f78f699f620
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
@@ -0,0 +1,3 @@
+[scrollBy.html]
+  [Ensure that the window.scrollBy function affects scroll position as expected]
+    expected: FAIL