diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 30bcbebc207..558903fe28b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -294938,6 +294938,12 @@
    "workers/constructors/SharedWorker/1.headers": [
     []
    ],
+   "workers/constructors/SharedWorker/Infinity": [
+    []
+   ],
+   "workers/constructors/SharedWorker/NaN": [
+    []
+   ],
    "workers/constructors/SharedWorker/connect-event.js": [
     []
    ],
@@ -449480,6 +449486,18 @@
      {}
     ]
    ],
+   "workers/constructors/SharedWorker/Infinity-arguments.html": [
+    [
+     "workers/constructors/SharedWorker/Infinity-arguments.html",
+     {}
+    ]
+   ],
+   "workers/constructors/SharedWorker/NaN-arguments.html": [
+    [
+     "workers/constructors/SharedWorker/NaN-arguments.html",
+     {}
+    ]
+   ],
    "workers/constructors/SharedWorker/URLMismatchError.htm": [
     [
      "workers/constructors/SharedWorker/URLMismatchError.htm",
@@ -751184,6 +751202,22 @@
    "e7ec0d6699d07e5b13d0cb6f24c3639258fccdaa",
    "support"
   ],
+  "workers/constructors/SharedWorker/Infinity": [
+   "d4c921c5658e6798ec56b06f513413572aab846a",
+   "support"
+  ],
+  "workers/constructors/SharedWorker/Infinity-arguments.html": [
+   "b38e55dc6bae2a64476676bcce9ace2e1a15dc8a",
+   "testharness"
+  ],
+  "workers/constructors/SharedWorker/NaN": [
+   "1d06329788c3a6fd7480f462a9d1ded231356962",
+   "support"
+  ],
+  "workers/constructors/SharedWorker/NaN-arguments.html": [
+   "8a4578a965a36cdf34a9231a6345e7b2f39994e6",
+   "testharness"
+  ],
   "workers/constructors/SharedWorker/URLMismatchError.htm": [
    "e1a11f4f8fe701365c89f9799794616975c39764",
    "testharness"
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    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 9eed3a29e9a..44c57c7e76c 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,18 +312,18 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     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 87c807a49ff..773361a5934 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,12 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%22nosniFF%22]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
+  [Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index ba7869a4741..6bd06899fdd 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -5,7 +5,7 @@
     expected: FAIL
 
   [Embedded credentials are treated as network errors in frames.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Embedded credentials are treated as network errors in new windows.]
     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_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 75d75b4cda2..dc2e45516de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_2.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..fd369192a02 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
+  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -7,5 +7,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    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 b3bd9f4c289..f6a7aca3306 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,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/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 dc856a3d5a3..e440b1e38c6 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,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.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/performance-timeline/webtiming-resolution.any.js.ini b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
index 97f8a0cc51f..6d08beab111 100644
--- a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
@@ -10,6 +10,3 @@
   [Verifies the resolution of entry.startTime is at least 20 microseconds.]
     expected: TIMEOUT
 
-  [Verifies the resolution of performance.now() is at least 5 microseconds.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
index 1c7ec9ce1db..b4090ef9fe2 100644
--- a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
+++ b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
@@ -1,4 +1,5 @@
 [crossorigin-sandwich-TAO.sub.html]
+  expected: ERROR
   [There should be one entry.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index f584fce5df1..268949ced5c 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,5 +1,4 @@
 [005.html]
-  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity
new file mode 100644
index 00000000000..d4c921c5658
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity
@@ -0,0 +1,3 @@
+onconnect = e => {
+  e.ports[0].postMessage(['Infinity', self.name]);
+};
diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity-arguments.html b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity-arguments.html
new file mode 100644
index 00000000000..b38e55dc6ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity-arguments.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<title>Infinity as arguments</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(t => {
+  const worker = new SharedWorker(Infinity, Infinity);
+  worker.port.onmessage = t.step_func_done(e => {
+    assert_equals(e.data[0], 'Infinity', 'first arg (script name)');
+    assert_equals(e.data[1], 'Infinity', 'second arg (worker name)');
+  });
+}, 'Test constructing a shared worker with Infinity');
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN
new file mode 100644
index 00000000000..1d06329788c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN
@@ -0,0 +1,3 @@
+onconnect = e => {
+  e.ports[0].postMessage(['NaN', self.name]);
+};
diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN-arguments.html b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN-arguments.html
new file mode 100644
index 00000000000..8a4578a965a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN-arguments.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<title>NaN as arguments</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(t => {
+  const worker = new SharedWorker(NaN, NaN);
+  worker.port.onmessage = t.step_func_done(e => {
+    assert_equals(e.data[0], 'NaN', 'first arg (script name)');
+    assert_equals(e.data[1], 'NaN', 'second arg (worker name)');
+  });
+}, 'Test constructing a shared worker with NaN');
+</script>