diff --git a/tests/content/test_document_characterSet_long.html b/tests/content/test_document_characterSet_long.html.disabled
similarity index 100%
rename from tests/content/test_document_characterSet_long.html
rename to tests/content/test_document_characterSet_long.html.disabled
diff --git a/tests/content/test_document_characterSet_short.html b/tests/content/test_document_characterSet_short.html.disabled
similarity index 100%
rename from tests/content/test_document_characterSet_short.html
rename to tests/content/test_document_characterSet_short.html.disabled
diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini
index f1d833595585..80b921e50af7 100644
--- a/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini
@@ -1,5 +1,3 @@
 [open-url-encoding.htm]
   type: testharness
-  [XMLHttpRequest: open() - URL encoding]
-    expected: FAIL
-
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini
new file mode 100644
index 000000000000..3fb54f006384
--- /dev/null
+++ b/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini
@@ -0,0 +1,3 @@
+[send-content-type-string.htm]
+  type: testharness
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
index 3903287d32a1..db509383662d 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
@@ -108,15 +108,3 @@
   [parent is picture, previous source has type removed]
     expected: FAIL
 
-  [ancestor picture has a source removed]
-    expected: FAIL
-
-  [ancestor picture; previous sibling source removed]
-    expected: FAIL
-
-  [src on previous sibling source set]
-    expected: FAIL
-
-  [class on previous sibling source set]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html.ini
index e7df78b9081c..af450694b730 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html.ini
@@ -18,9 +18,6 @@
   ["\\n\\ndata:,a\\n\\n1x\\n\\n"]
     expected: FAIL
 
-  ["\xef\xbf\xbd\xef\xbf\xbddata:,a\xef\xbf\xbd\xef\xbf\xbd1x\xef\xbf\xbd\xef\xbf\xbd"]
-    expected: FAIL
-
   ["\\f\\fdata:,a\\f\\f1x\\f\\f"]
     expected: FAIL
 
@@ -267,9 +264,6 @@
   ["data:,a 0X1w"]
     expected: FAIL
 
-  ["data:,a 1\xef\xbf\xbdw" (trailing U+0001)]
-    expected: FAIL
-
   ["data:,a 1\xc2\xa0w" (trailing U+00A0)]
     expected: FAIL
 
@@ -327,9 +321,6 @@
   ["data:,a 1\xef\xbb\xbfw" (trailing U+FEFF)]
     expected: FAIL
 
-  ["data:,a \xef\xbf\xbd1w" (leading U+0001)]
-    expected: FAIL
-
   ["data:,a \xc2\xa01w" (leading U+00A0)]
     expected: FAIL
 
@@ -423,9 +414,6 @@
   ["data:,a 0X1x"]
     expected: FAIL
 
-  ["data:,a 1\xef\xbf\xbdx" (trailing U+0001)]
-    expected: FAIL
-
   ["data:,a 1\xc2\xa0x" (trailing U+00A0)]
     expected: FAIL
 
@@ -483,9 +471,6 @@
   ["data:,a 1\xef\xbb\xbfx" (trailing U+FEFF)]
     expected: FAIL
 
-  ["data:,a \xef\xbf\xbd1x" (leading U+0001)]
-    expected: FAIL
-
   ["data:,a \xc2\xa01x" (leading U+00A0)]
     expected: FAIL
 
@@ -573,9 +558,6 @@
   ["data:,a 0X1h"]
     expected: FAIL
 
-  ["data:,a 1w 1\xef\xbf\xbdh" (trailing U+0001)]
-    expected: FAIL
-
   ["data:,a 1w 1\xc2\xa0h" (trailing U+00A0)]
     expected: FAIL
 
@@ -633,9 +615,6 @@
   ["data:,a 1w 1\xef\xbb\xbfh" (trailing U+FEFF)]
     expected: FAIL
 
-  ["data:,a 1w \xef\xbf\xbd1h" (leading U+0001)]
-    expected: FAIL
-
   ["data:,a 1w \xc2\xa01h" (leading U+00A0)]
     expected: FAIL
 
@@ -693,3 +672,36 @@
   ["data:,a 1w \xef\xbb\xbf1h" (leading U+FEFF)]
     expected: FAIL
 
+  ["\\v\\vdata:,a\\v\\v1x\\v\\v"]
+    expected: FAIL
+
+  ["\\r\\rdata:,a\\r\\r1x\\r\\r"]
+    expected: FAIL
+
+  ["\\x0e\\x0edata:,a\\x0e\\x0e1x\\x0e\\x0e"]
+    expected: FAIL
+
+  ["\\x0f\\x0fdata:,a\\x0f\\x0f1x\\x0f\\x0f"]
+    expected: FAIL
+
+  ["\\x10\\x10data:,a\\x10\\x101x\\x10\\x10"]
+    expected: FAIL
+
+  ["data:,a 1\\x01w" (trailing U+0001)]
+    expected: FAIL
+
+  ["data:,a \\x011w" (leading U+0001)]
+    expected: FAIL
+
+  ["data:,a 1\\x01x" (trailing U+0001)]
+    expected: FAIL
+
+  ["data:,a \\x011x" (leading U+0001)]
+    expected: FAIL
+
+  ["data:,a 1w 1\\x01h" (trailing U+0001)]
+    expected: FAIL
+
+  ["data:,a 1w \\x011h" (leading U+0001)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
index 08df606ea48e..dd1e489c7201 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
@@ -66,195 +66,201 @@
   [<picture></picture><span></span><source srcset="data:,b"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><svg></svg><source srcset="data:,b"></source><img src="data:,a" data-expect="data:,a">]
+  [<picture></picture><img src="data:,a"><img src="data:,b" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><svg></svg><source srcset="data:,b">]
+  [<picture></picture><img src="data:,a" data-expect="data:,a">foo]
     expected: FAIL
 
-  [<picture></picture><svg></svg><!--<font face> tag breaks out of svg--><font face=""></font><source srcset="data:,b">]
+  [<picture></picture><img src="data:,a" data-expect="data:,a"><br>]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a"><img src="data:,b" data-expect="data:,b">]
+  [<picture></picture><img src="data:,a" data-expect="data:,a"><!--foo-->]
     expected: FAIL
 
-  [<picture></picture><source>]
+  [<picture></picture><img src="data:,a" data-expect="data:,a"><img src="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source src="data:,b">]
+  [<picture></picture><img data-expect=""><img src="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="">]
+  [<picture></picture><img src="data:,a" data-expect="data:,a"><source srcset="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset=", ,">]
+  [<picture></picture><img data-expect=""><source srcset="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b 1x 1x">]
+  [<picture></picture><svg></svg><source srcset="data:,b"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="">]
+  [<picture></picture><svg></svg><source srcset="data:,b"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="all">]
+  [<picture></picture><svg></svg><font></font><source srcset="data:,b"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="all and (min-width:0)">]
+  [<picture></picture><svg></svg><!--<font face> tag breaks out of svg--><font face=""></font><source srcset="data:,b"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="all and !">]
+  [<picture></picture><source><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="all and (!)">]
+  [<picture></picture><source src="data:,b"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="not all">]
+  [<picture></picture><source srcset=""><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="not all and (min-width:0)">]
+  [<picture></picture><source srcset=", ,"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="not all and (max-width:0)">]
+  [<picture></picture><source srcset="data:,b 1x 1x"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="not all and !">]
+  [<picture></picture><source srcset="data:,b" media=""><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="not all and (!)">]
+  [<picture></picture><source srcset="data:,b" media="all"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media="all, !">]
+  [<picture></picture><source srcset="data:,b" media="all and (min-width:0)"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media=",">]
+  [<picture></picture><source srcset="data:,b" media="all and !"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="">]
+  [<picture></picture><source srcset="data:,b" media="all and (!)"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type=" ">]
+  [<picture></picture><source srcset="data:,b" media="not all"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif">]
+  [<picture></picture><source srcset="data:,b" media="not all and (min-width:0)"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type=" image/gif">]
+  [<picture></picture><source srcset="data:,b" media="not all and (max-width:0)"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif ">]
+  [<picture></picture><source srcset="data:,b" media="not all and !"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif;">]
+  [<picture></picture><source srcset="data:,b" media="not all and (!)"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif;encodings">]
+  [<picture></picture><source srcset="data:,b" media="all, !"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif;encodings=">]
+  [<picture></picture><source srcset="data:,b" media=","><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif;encodings=foobar">]
+  [<picture></picture><source srcset="data:,b" media=", all"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/png">]
+  [<picture></picture><source srcset="data:,b" type=""><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/jpeg">]
+  [<picture></picture><source srcset="data:,b" type=" "><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/svg+xml">]
+  [<picture></picture><source srcset="data:,b" type="image/gif"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/x-icon">]
+  [<picture></picture><source srcset="data:,b" type=" image/gif"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="text/xml">]
+  [<picture></picture><source srcset="data:,b" type="image/gif "><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="text/html">]
+  [<picture></picture><source srcset="data:,b" type="image/gif;"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="text/plain">]
+  [<picture></picture><source srcset="data:,b" type="image/gif;encodings"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="text/css">]
+  [<picture></picture><source srcset="data:,b" type="image/gif;encodings="><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="video/mp4">]
+  [<picture></picture><source srcset="data:,b" type="image/gif;encodings=foobar"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="video/ogg">]
+  [<picture></picture><source srcset="data:,b" type="image/png"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="video/webm">]
+  [<picture></picture><source srcset="data:,b" type="image/jpeg"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="unknown/unknown">]
+  [<picture></picture><source srcset="data:,b" type="image/svg+xml"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="application/octet-stream">]
+  [<picture></picture><source srcset="data:,b" type="image/x-icon"><img src="data:,a" data-expect="data:,b">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="application/x-shockwave-flash">]
+  [<picture></picture><source srcset="data:,b" type="text/xml"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image\\gif">]
+  [<picture></picture><source srcset="data:,b" type="text/html"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="gif">]
+  [<picture></picture><source srcset="data:,b" type="text/plain"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type=".gif">]
+  [<picture></picture><source srcset="data:,b" type="text/css"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="*">]
+  [<picture></picture><source srcset="data:,b" type="video/mp4"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="*/*">]
+  [<picture></picture><source srcset="data:,b" type="video/ogg"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/*">]
+  [<picture></picture><source srcset="data:,b" type="video/webm"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type=",">]
+  [<picture></picture><source srcset="data:,b" type="unknown/unknown"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif, image/png">]
+  [<picture></picture><source srcset="data:,b" type="application/octet-stream"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/gif image/png">]
+  [<picture></picture><source srcset="data:,b" type="application/x-shockwave-flash"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" type="image/foobarbaz">]
+  [<picture></picture><source srcset="data:,b" type="image\\gif"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a" data-expect="data:,a">foo]
+  [<picture></picture><source srcset="data:,b" type="gif"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a" data-expect="data:,a"><br>]
+  [<picture></picture><source srcset="data:,b" type=".gif"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a" data-expect="data:,a"><!--foo-->]
+  [<picture></picture><source srcset="data:,b" type="*"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a" data-expect="data:,a"><img src="data:,b">]
+  [<picture></picture><source srcset="data:,b" type="*/*"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img data-expect=""><img src="data:,b">]
+  [<picture></picture><source srcset="data:,b" type="image/*"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img src="data:,a" data-expect="data:,a"><source srcset="data:,b">]
+  [<picture></picture><source srcset="data:,b" type=","><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><img data-expect=""><source srcset="data:,b">]
+  [<picture></picture><source srcset="data:,b" type="image/gif, image/png"><img src="data:,a" data-expect="data:,a">]
+    expected: FAIL
+
+  [<picture></picture><source srcset="data:,b" type="image/gif image/png"><img src="data:,a" data-expect="data:,a">]
+    expected: FAIL
+
+  [<picture></picture><source srcset="data:,b" type="image/foobarbaz"><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><span></span><source srcset="data:,b">]
+  [<picture></picture><span></span><source srcset="data:,b"><img data-expect="">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b">]
+  [<picture></picture><source srcset="data:,b"><span></span><img src="data:,a" data-expect="data:,a">]
     expected: FAIL
 
-  [<picture></picture><source srcset="data:,b" media=", all">]
+  [<picture></picture><source srcset="data:,b"><img data-expect="data:,b">]
     expected: FAIL