diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-color/t32-opacity-zorder-c.xht.ini b/tests/wpt/metadata-layout-2020/css/css-color/t32-opacity-zorder-c.xht.ini
new file mode 100644
index 00000000000..9d759c70124
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-color/t32-opacity-zorder-c.xht.ini
@@ -0,0 +1,2 @@
+[t32-opacity-zorder-c.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index f3fe2d6975d..ae7c8be408c 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,21 +312,24 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..5c001592859 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 30e1b851fd4..61682d248e2 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
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
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 9eb581fcf1f..0407f0cc2b7 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,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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 f4f994c5d6f..0fbc49ea1c1 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,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/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 450c88bd32b..dbec6f2c2ff 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
@@ -3,6 +3,3 @@
   [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/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index a900d024b42..9db58c39cad 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -125529,6 +125529,19 @@
        {}
       ]
      ],
+     "t32-opacity-basic-0.6-a.xht": [
+      "8978581461c0c567d456b468b31f1c7a4b0fb376",
+      [
+       null,
+       [
+        [
+         "/css/css-color/t32-opacity-basic-0.6-a-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "t32-opacity-basic-1.0-a.xht": [
       "6d8ea9ec127a322e1be436aa32885e3a3265a92b",
       [
@@ -125620,6 +125633,19 @@
        {}
       ]
      ],
+     "t32-opacity-zorder-c.xht": [
+      "4614a64b7eee2da7cd3dd6cdc904ff29ec64cc27",
+      [
+       null,
+       [
+        [
+         "/css/css-color/t32-opacity-zorder-c-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "t41-html4-keywords-a.xht": [
       "3a3e332ed565f6c905e0d18bd02c1ee03bd4bcd7",
       [
@@ -125724,6 +125750,19 @@
        {}
       ]
      ],
+     "t421-rgb-hex3-expand-b.xht": [
+      "5ba02ea6a571954cd3441ae2b2102489039b59ae",
+      [
+       null,
+       [
+        [
+         "/css/css-color/t421-rgb-hex3-expand-b-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "t421-rgb-hex6-a.xht": [
       "fba70dd0a4728c12cb88003e6e121ea3baea1ccf",
       [
@@ -125763,6 +125802,19 @@
        {}
       ]
      ],
+     "t422-rgba-a0.6-a.xht": [
+      "39c33732c4c6bda68a7772e656229e466bc62d08",
+      [
+       null,
+       [
+        [
+         "/css/css-color/t32-opacity-basic-0.6-a-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "t422-rgba-a1.0-a.xht": [
       "493bfecd3ff9367472707813b5cf9b37eeabee6d",
       [
@@ -126179,6 +126231,19 @@
        {}
       ]
      ],
+     "t425-hsla-basic-a.xht": [
+      "2d944f3928dfd457dfc26311068fddcfb63ca800",
+      [
+       null,
+       [
+        [
+         "/css/css-color/t425-hsla-basic-a-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "t425-hsla-clip-outside-device-gamut-b.xht": [
       "8dbab291cdaf1352c8099ce97ced9ef1fa807b33",
       [
@@ -291936,6 +292001,10 @@
       "298c4890dffede87edc4b042c13a254a15a95f53",
       []
      ],
+     "t32-opacity-basic-0.6-a-ref.html": [
+      "36ba43e5da330fb8f6ca0dd738a91acd82bf3c07",
+      []
+     ],
      "t32-opacity-basic-1.0-a-ref.html": [
       "b59c82f46dacc3b07a3d0c42f84298415f97825a",
       []
@@ -291960,6 +292029,10 @@
       "923e4495d41043493e2eb3074473fc1f84d30ee8",
       []
      ],
+     "t32-opacity-zorder-c-ref.html": [
+      "deaf50957b1079e5a3f953edb76ac5dbc413cc69",
+      []
+     ],
      "t41-html4-keywords-a-ref.html": [
       "4f95dff21cb50ba462fdde6057e1d1f9d36c2fdd",
       []
@@ -291969,7 +292042,7 @@
       []
      ],
      "t421-rgb-hex3-expand-b-ref.html": [
-      "842ead1c0b40185694ae6e734dc9c829448fa029",
+      "43ac1d39a34dddbb9c5b01a1c661a1fab8c1751a",
       []
      ],
      "t421-rgb-values-meaning-b-ref.html": [
@@ -292096,6 +292169,10 @@
       "ac42b1f86ce97a2e95aafe91f53cc5ff125ca73e",
       []
      ],
+     "t425-hsla-basic-a-ref.html": [
+      "757800f2ea654795fd40ae52f5744a077c3b0069",
+      []
+     ],
      "t425-hsla-clip-outside-device-gamut-b-ref.html": [
       "d35a608fb58c1f9258477207ddb12dd89e93f9a1",
       []
@@ -556248,43 +556325,6 @@
       ]
      ]
     },
-    "css-color": {
-     "t32-opacity-basic-0.6-a.xht": [
-      "a43b99cb4b0c65b8047300cb8ed574e45ef07a67",
-      [
-       null,
-       {}
-      ]
-     ],
-     "t32-opacity-zorder-c.xht": [
-      "7d733c83c76947ebe87707f914773e46155aa712",
-      [
-       null,
-       {}
-      ]
-     ],
-     "t421-rgb-hex3-expand-b.xht": [
-      "ebb56573d23193f228db49826327c6b5ffa33e85",
-      [
-       null,
-       {}
-      ]
-     ],
-     "t422-rgba-a0.6-a.xht": [
-      "3cfc2a9a32b0be3df0cf44157349edf22cae911c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "t425-hsla-basic-a.xht": [
-      "da302a857ba43abe8b39e2a0a33a589c1e3dd896",
-      [
-       null,
-       {}
-      ]
-     ]
-    },
     "css-display": {
      "run-in": {
       "after-content-display-004.xht": [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 0c49313e646..55d365731c8 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,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    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 d2df9b78483..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error 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 30e1b851fd4..61682d248e2 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[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
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
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 45d8be1c898..d43f38b40cd 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,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/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 e440b1e38c6..71edac2c5ed 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,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
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 01f7b72cbe7..0cef5158fae 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
@@ -4,6 +4,3 @@
   [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/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a-ref.html b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a-ref.html
new file mode 100644
index 00000000000..36ba43e5da3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+  .test { color: rgb(102, 102, 102); }
+</style>
+<body>
+    <p class="test">This text should be the same color as the line below.</p>
+    <p class="test">This text should be the same color as the line above.</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht
index a43b99cb4b0..8978581461c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht
+++ b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht
@@ -6,6 +6,7 @@
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#transparency" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#rgb-color" />
+		<link rel="match" href="t32-opacity-basic-0.6-a-ref.html" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="Opacity of 0.6 makes box partially opaque.  Colors are in sRGB color space (may test)." />
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c-ref.html b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c-ref.html
new file mode 100644
index 00000000000..deaf50957b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c-ref.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+  table { border-spacing: 2px; }
+  td { border: 1px solid; }
+  td, div { width: 10px; height: 10px; }
+  div.opc { opacity: 0.99; }
+  div.green { background: green; }
+  div.up { margin-top: -10px; }
+  div.red { background: red; }
+</style>
+<body>
+  <p>Each of the following boxes should have a green or
+  very-nearly-green square inside of it:</p>
+  <table><tr>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="red"></div>
+      <div class="up opc green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="red"></div>
+      <div class="up opc green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="red"></div>
+      <div class="up opc green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="green"></div>
+    </td>
+    <td>
+      <div class="red"></div>
+      <div class="up opc green"></div>
+    </td>
+    <td>
+      <div class="red"></div>
+      <div class="up opc green"></div>
+    </td>
+  </tr></table>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht
index 7d733c83c76..4614a64b7ee 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht
+++ b/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht
@@ -5,6 +5,7 @@
 		<link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#transparency" />
+		<link rel="match" href="t32-opacity-zorder-c-ref.html" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="Opacity has z-ordering treatment of positioned elements and z-index applies." />
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html b/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html
index 842ead1c0b4..43ac1d39a34 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html
@@ -17,8 +17,8 @@
   <p>The left and right cells in each row of the following table should be slightly <em>different</em> colors.  The right side should be slightly darker than the left.</p>
 
   <table>
-    <tr><td style="background: #e09020">&nbsp;</td><td style="background: #e09020">&nbsp;</td></tr>
-    <tr><td style="background: #f0b000">&nbsp;</td><td style="background: #f0b000">&nbsp;</td></tr>
-    <tr><td style="background: #308010">&nbsp;</td><td style="background: #308010">&nbsp;</td></tr>
+    <tr><td style="background: #ee9922">&nbsp;</td><td style="background: #e09020">&nbsp;</td></tr>
+    <tr><td style="background: #ffbb00">&nbsp;</td><td style="background: #f0b000">&nbsp;</td></tr>
+    <tr><td style="background: #338811">&nbsp;</td><td style="background: #308010">&nbsp;</td></tr>
   </table>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht b/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht
index ebb56573d23..5ba02ea6a57 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht
+++ b/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht
@@ -5,6 +5,7 @@
 		<link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#rgb-color" />
+		<link rel="match" href="t421-rgb-hex3-expand-b-ref.html" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="Test that 3-digit #rgb values are expanded into #rrggbb and not #r0g0b0" />
 		<style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht b/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht
index 3cfc2a9a32b..39c33732c4c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht
+++ b/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht
@@ -6,6 +6,7 @@
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#rgba-color" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#rgb-color" />
+		<link rel="match" href="t32-opacity-basic-0.6-a-ref.html" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="Opacity of 0.6 makes text partially opaque.  Colors are in sRGB color space (may test)." />
 		<style type="text/css"><![CDATA[
@@ -16,7 +17,7 @@
 		]]></style>
 	</head>
 	<body>
-		<p id="one">This text should be the same color (a shade of gray) as the line below.</p>
-		<p id="two">This text should be the same color (a shade of gray) as the line above.</p>
+		<p id="one">This text should be the same color as the line below.</p>
+		<p id="two">This text should be the same color as the line above.</p>
 	</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a-ref.html b/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a-ref.html
new file mode 100644
index 00000000000..757800f2ea6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference</title>
+<style>
+    #one { color: #66FF66; }
+</style>
+<body>
+    <p id="one">This text should be light green (the same color as the line below).</p>
+    <p id="one">This text should be light green (the same color as the line above).</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht b/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht
index da302a857ba..2d944f3928d 100644
--- a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht
+++ b/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht
@@ -5,11 +5,11 @@
 		<link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 		<link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 		<link rel="help" href="http://www.w3.org/TR/css3-color/#hsla-color" />
+		<link rel="match" href="t425-hsla-basic-a-ref.html" />
 		<meta name="flags" content="" />
 		<meta name="assert" content="Test basic functioning of hsla() colors." />
 		<style type="text/css"><![CDATA[
 		html, body { background: white; }
-		p { font-weight: bold; margin: 0; }
 		#one { color: hsla(120, 100%, 70%, 1.0); }
 		#two { color: hsla(120, 100%, 50%, 0.6); }
 		]]></style>