diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 6b7c74fb63c..5a3b9acfd3b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -665713,7 +665713,7 @@
    "testharness"
   ],
   "html/semantics/forms/form-submission-0/SubmitEvent.window.js": [
-   "93dbabb866beeba9e04d0d4f99dde78f448e8dff",
+   "ca722315d815a0e40566f8dee63f5b1c389670b2",
    "testharness"
   ],
   "html/semantics/forms/form-submission-0/constructing-form-data-set.html": [
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    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 117c8f9a8c3..ad826e381b5 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,18 +315,18 @@
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
     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 b7052af5b5c..d4ba399b762 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20'NosniFF']
     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_2.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- 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_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index 16fa2c5cfc1..dec4c579137 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,5 @@
 [creating_browsing_context_test_01.html]
+  expected: TIMEOUT
   [first argument: absolute url]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..f1aa94c7ced 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -6,11 +7,14 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Non-HTMLElement should not support autofocus]
+    expected: TIMEOUT
 
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 2568040e6e5..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,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: CRASH
+  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/forms/form-submission-0/SubmitEvent.window.js.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/SubmitEvent.window.js.ini
index 13cc8c489a3..74cd4de030f 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/SubmitEvent.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/SubmitEvent.window.js.ini
@@ -14,3 +14,9 @@
   [Successful SubmitEvent constructor; missing dictionary]
     expected: FAIL
 
+  [Successful SubmitEvent constructor; null/undefined submitter]
+    expected: FAIL
+
+  [Successful SubmitEvent constructor; null/undefined dictionary]
+    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/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
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/html/semantics/forms/form-submission-0/SubmitEvent.window.js b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js
index 93dbabb866b..ca722315d81 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js
@@ -4,12 +4,6 @@ test(() => {
   let button = document.createElement('button');
   let typeError = new TypeError();
   assert_throws(typeError, () => { new SubmitEvent() }, '0 arguments');
-  assert_throws(typeError, () => { new SubmitEvent('bar', button) }, '1 invalid arguments');
-  assert_throws(typeError, () => { new SubmitEvent(button, button) }, '2 invalid arguments');
-  assert_throws(typeError, () => { new SubmitEvent('foo', null) }, 'Null dictionary');
-  assert_throws(typeError, () => { new SubmitEvent('foo', undefined) }, 'Undefined dictionary');
-  assert_throws(typeError, () => { new SubmitEvent('foo', { submitter: null }) }, 'Null submitter');
-  assert_throws(typeError, () => { new SubmitEvent('foo', { submitter: undefined }) }, 'Undefined submitter');
   assert_throws(typeError, () => { new SubmitEvent('foo', { submitter: 'bar' }) }, 'Wrong type of submitter');
 }, 'Failing SubmitEvent constructor');
 
@@ -21,16 +15,28 @@ test(() => {
 }, 'Successful SubmitEvent constructor');
 
 test(() => {
-  let event = new SubmitEvent('bar', { submitter: null});
-  assert_equals(event.submitter, null);
-}, 'Successful SubmitEvent constructor; null submitter');
+  let event1 = new SubmitEvent('bar', {submitter: null});
+  assert_equals(event1.submitter, null);
+  let event2 = new SubmitEvent('baz', {submitter: undefined});
+  assert_equals(event2.submitter, null);
+}, 'Successful SubmitEvent constructor; null/undefined submitter');
 
 test(() => {
-  let event = new SubmitEvent('baz', {});
-  assert_equals(event.submitter, null);
+  let event1 = new SubmitEvent('bar', null);
+  assert_equals(event1.submitter, null);
+  let event2 = new SubmitEvent('baz', undefined);
+  assert_equals(event2.submitter, null);
+}, 'Successful SubmitEvent constructor; null/undefined dictionary');
+
+test(() => {
+  let event1 = new SubmitEvent('bar', {});
+  assert_equals(event1.submitter, null);
+  let button = document.createElement('button');
+  let event2 = new SubmitEvent("bax", button);
+  assert_equals(event2.submitter, null);
 }, 'Successful SubmitEvent constructor; empty dictionary');
 
 test(() => {
-  let event = new SubmitEvent('baz');
+  let event = new SubmitEvent('bar');
   assert_equals(event.submitter, null);
 }, 'Successful SubmitEvent constructor; missing dictionary');