Auto merge of #21599 - servo-wpt-sync:wpt_update_03-09-2018, r=jdm

Sync WPT with upstream (03-09-2018)

Automated downstream sync of changes from upstream as of 03-09-2018.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21599)
<!-- Reviewable:end -->

51 files changed, 843 insertions, 298 deletions

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index d1d373f4557..1e0eca2c595 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -11731,6 +11731,12 @@
      {}
     ]
    ],
+   "hr-time/unload-manual.html": [
+    [
+     "/hr-time/unload-manual.html",
+     {}
+    ]
+   ],
    "html-longdesc/data-uri-image-data-uri-description-manual.html": [
     [
      "/html-longdesc/data-uri-image-data-uri-description-manual.html",
@@ -185209,6 +185215,18 @@
      {}
     ]
    ],
+   "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html": [
+    [
+     "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html",
+     [
+      [
+       "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html": [
     [
      "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html",
@@ -281045,6 +281063,26 @@
      {}
     ]
    ],
+   "hr-time/resources/unload-a.html": [
+    [
+     {}
+    ]
+   ],
+   "hr-time/resources/unload-b.html": [
+    [
+     {}
+    ]
+   ],
+   "hr-time/resources/unload-c.html": [
+    [
+     {}
+    ]
+   ],
+   "hr-time/resources/unload.js": [
+    [
+     {}
+    ]
+   ],
    "html-longdesc/META.yml": [
     [
      {}
@@ -287765,6 +287803,11 @@
      {}
     ]
    ],
+   "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html": [
+    [
+     {}
+    ]
+   ],
    "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html": [
     [
      {}
@@ -289695,6 +289738,16 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/is-module-goal.mjs": [
+    [
+     {}
+    ]
+   ],
+   "html/semantics/scripting-1/the-script-element/is-script-goal.js": [
+    [
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/log.py": [
     [
      {}
@@ -315225,6 +315278,11 @@
      {}
     ]
    ],
+   "workers/support/imported_script.py": [
+    [
+     {}
+    ]
+   ],
    "workers/support/name-as-accidental-global.js": [
     [
      {}
@@ -336176,7 +336234,9 @@
    "css/css-transitions/transitions-animatable-properties-01.html": [
     [
      "/css/css-transitions/transitions-animatable-properties-01.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "css/css-transitions/zero-duration-multiple-transition.html": [
@@ -357769,6 +357829,12 @@
      {}
     ]
    ],
+   "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html": [
+    [
+     "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html",
+     {}
+    ]
+   ],
    "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html": [
     [
      "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html",
@@ -363721,6 +363787,12 @@
      {}
     ]
    ],
+   "html/semantics/scripting-1/the-script-element/goal-parameter.htm": [
+    [
+     "/html/semantics/scripting-1/the-script-element/goal-parameter.htm",
+     {}
+    ]
+   ],
    "html/semantics/scripting-1/the-script-element/historical.html": [
     [
      "/html/semantics/scripting-1/the-script-element/historical.html",
@@ -403485,6 +403557,20 @@
      {}
     ]
    ],
+   "workers/importscripts_mime.tentative.any.js": [
+    [
+     "/workers/importscripts_mime.tentative.any.serviceworker.html",
+     {}
+    ],
+    [
+     "/workers/importscripts_mime.tentative.any.sharedworker.html",
+     {}
+    ],
+    [
+     "/workers/importscripts_mime.tentative.any.worker.html",
+     {}
+    ]
+   ],
    "workers/interfaces.worker.js": [
     [
      "/workers/interfaces.worker.html",
@@ -544269,11 +544355,11 @@
    "reftest"
   ],
   "css/css-multicol/multicol-rule-shorthand-2-ref.xht": [
-   "757283350f5b03e61919be735c5397aeb512679d",
+   "b49e941337e31c675fa76f51574750e7023a28a6",
    "support"
   ],
   "css/css-multicol/multicol-rule-shorthand-2.xht": [
-   "ab7d75644d8a74982d7b0c30f9f29a065c899231",
+   "4e4d94f8e83bf18b4d1cd112755abf7827167565",
    "reftest"
   ],
   "css/css-multicol/multicol-rule-solid-000-ref.xht": [
@@ -544421,67 +544507,67 @@
    "support"
   ],
   "css/css-multicol/multicol-width-001-ref.xht": [
-   "926bb66423e1597529f22a316bdde16319aa75ae",
+   "dddb96880af819d730b83604a487c4938fda4933",
    "support"
   ],
   "css/css-multicol/multicol-width-001.xht": [
-   "84cf1ff893cc05bbe9e278b4667731bac7e6130f",
+   "02cbf9b4f262dee4f07050ccf1f44eef118daf02",
    "reftest"
   ],
   "css/css-multicol/multicol-width-002-ref.xht": [
-   "59d54cadccdd86461e4cff388704dd8c88f672c0",
+   "68e10339a1c0acade42890c78d59ab437b22d3d8",
    "support"
   ],
   "css/css-multicol/multicol-width-002.xht": [
-   "f838020e427c502b466ae62b20e1e2574f215b4b",
+   "78a149590580d8275e53425fa46cae79dbf2e55f",
    "reftest"
   ],
   "css/css-multicol/multicol-width-003.xht": [
-   "a05a32d8bbb0ac5fb8ab18c2f4f2278e9a446112",
+   "0e91866163b2b7d7da9a3810a8dc7b622cbcbf56",
    "reftest"
   ],
   "css/css-multicol/multicol-width-ch-001.xht": [
-   "c3e3b353028087d96bb5328cb3342cdd3deb17b3",
+   "8983e00fff0efb4c9a8e89182b0d193b2293d50b",
    "reftest"
   ],
   "css/css-multicol/multicol-width-ch-ref.xht": [
-   "133ad3e4b24b02cbf1bc5325dd789a90e0bd0706",
+   "8adefc11e76800c076e8e888e3a21129ef17b10d",
    "support"
   ],
   "css/css-multicol/multicol-width-count-001.xht": [
-   "eeec2dc3e66f7d492d95555a9dd10057f19c490b",
+   "3fde0610ac6efb0dc159ebde7f98efc723fca5e5",
    "reftest"
   ],
   "css/css-multicol/multicol-width-count-002.xht": [
-   "9b9bffc8484286d26a6c0c15fb36dc7378c4b601",
+   "6de99956e3be9b90c339b0bde4d77b6b9050b9d8",
    "reftest"
   ],
   "css/css-multicol/multicol-width-invalid-001-ref.xht": [
-   "a583e30f3d79ffeb766c78f1f54c3c911248471e",
+   "8664fc38253abbae3339a867e0e1c7085afb4a04",
    "support"
   ],
   "css/css-multicol/multicol-width-invalid-001.xht": [
-   "76c9a57774cfc4c162dad3d24b161d40e5d3db1b",
+   "83128b1f33b625734290fa654cec222245e67310",
    "reftest"
   ],
   "css/css-multicol/multicol-width-large-001.xht": [
-   "cb943a7fad3c60ea0e4016b614c3df70a56001df",
+   "04530e93d7ca342f5cbb3f9bb5eccc1e90a33855",
    "reftest"
   ],
   "css/css-multicol/multicol-width-large-002.xht": [
-   "60528159db7db0e77d02870bbf9593cc64da125e",
+   "2efa3941d8fe326739d44c2e755960fa6984d1ad",
    "reftest"
   ],
   "css/css-multicol/multicol-width-negative-001.xht": [
-   "5370b8033bcaeefc2a98f978707513440ffc8f12",
+   "dd7d515499df5e68031d66bffcdedf2f15dee359",
    "reftest"
   ],
   "css/css-multicol/multicol-width-small-001-ref.xht": [
-   "eb427d1da4a2ff4d6410a0b1d295143f31e7d55e",
+   "a862607a6ba0db977dec90f7beaad30e1a8d6fc6",
    "support"
   ],
   "css/css-multicol/multicol-width-small-001.xht": [
-   "c034815060b3a461deedb08ac376ebc1d87fb825",
+   "8ef3bfa6ac0dc331e3398b3f751e6edae5375030",
    "reftest"
   ],
   "css/css-multicol/multicol-zero-height-001-ref.xht": [
@@ -561245,7 +561331,7 @@
    "testharness"
   ],
   "css/css-transitions/transitions-animatable-properties-01.html": [
-   "06143d3061da89a148adda0e6bf2cf8f968f0f89",
+   "534f81839ac875ff6b5c5c7b17784258d7a8932c",
    "testharness"
   ],
   "css/css-transitions/zero-duration-multiple-transition.html": [
@@ -571277,7 +571363,7 @@
    "support"
   ],
   "css/css-writing-modes/svg-aliasing-001.html": [
-   "bc32f202e2b17878c6f3e6c1938676a92c6338c4",
+   "3979459838ee19b78655073122afd0cb92f8b357",
    "reftest"
   ],
   "css/css-writing-modes/svg-aliasing-002.html": [
@@ -590205,7 +590291,7 @@
    "support"
   ],
   "encrypted-media/scripts/playback-temporary-expired.js": [
-   "5144ef967f78fef82aee7821a091c876b48f441c",
+   "3d1bd9591db309deb64df8765f5a7fd6fb5c4791",
    "support"
   ],
   "encrypted-media/scripts/playback-temporary-multikey-sequential.js": [
@@ -593716,6 +593802,22 @@
    "5bec688af9cd3c02ef00055d5bf4642841c04951",
    "support"
   ],
+  "hr-time/resources/unload-a.html": [
+   "40c1d061830e6fd36d740ba49f5252b8b00bc813",
+   "support"
+  ],
+  "hr-time/resources/unload-b.html": [
+   "7c2d90df275fbc15f79d71fa2c57131fb7f99a5d",
+   "support"
+  ],
+  "hr-time/resources/unload-c.html": [
+   "731da9db758ba52a2d0f67222e41dc8cff76071b",
+   "support"
+  ],
+  "hr-time/resources/unload.js": [
+   "ab6b121c2b5cedd5f79015f3f1aa3ef1fddd7fb0",
+   "support"
+  ],
   "hr-time/test_cross_frame_start.html": [
    "30e804bd7350315497115b75929a52ac1d82d3cb",
    "testharness"
@@ -593728,6 +593830,10 @@
    "71ade4a8c48ce2d0df59537d1a6d48a4ada08b8a",
    "testharness"
   ],
+  "hr-time/unload-manual.html": [
+   "18c4e0dc327919361af8bdd730ba25904263ff97",
+   "manual"
+  ],
   "hr-time/window-worker-timeOrigin.window.js": [
    "1e5ef1cdffecf639363aa06b72665f54ccce1156",
    "testharness"
@@ -602408,6 +602514,10 @@
    "e7529946a49c0da964dae79831047e4a0507f119",
    "reftest"
   ],
+  "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html": [
+   "4abd9ce533d7740e906a83a0e8cbc67c8613bf52",
+   "testharness"
+  ],
   "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html": [
    "f07c84f406cefc7054e8a13c2796d3d82673bdf7",
    "testharness"
@@ -602452,6 +602562,14 @@
    "cacbdbae00d0f7d6067323c68fc460149c524f35",
    "reftest"
   ],
+  "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html": [
+   "d9b36e530b4f95bdfc636050905e6bfd5d8af690",
+   "support"
+  ],
+  "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html": [
+   "2599f2f0fa201c94234d172d06700c1a8ec19a65",
+   "reftest"
+  ],
   "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html": [
    "13b262a804ab781905b3e4d3483554d9dd95b4d8",
    "support"
@@ -608496,10 +608614,22 @@
    "ca7fdba71f164c0a1e7c195675497b02f2e0a0a5",
    "support"
   ],
+  "html/semantics/scripting-1/the-script-element/goal-parameter.htm": [
+   "fe4d6759b91b09da5a6c7bb0b53095315d10d4a9",
+   "testharness"
+  ],
   "html/semantics/scripting-1/the-script-element/historical.html": [
    "1f1a91228c2174773243163e5b588e56c2c74fc1",
    "testharness"
   ],
+  "html/semantics/scripting-1/the-script-element/is-module-goal.mjs": [
+   "b533fc2e906b4b9a0a912044b19ee523ae5eef7a",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/is-script-goal.js": [
+   "069363dd400da159b74847a3ea4299292a92d4f5",
+   "support"
+  ],
   "html/semantics/scripting-1/the-script-element/load-error-events-1.html": [
    "45571550e1cc29bfaa218ad06f7c7b20b903a53b",
    "testharness"
@@ -612745,7 +612875,7 @@
    "support"
   ],
   "interfaces/cssom-view.idl": [
-   "0213a4090c717812b7e4a1c81b8558d3bebfd287",
+   "2b5b381dfa4af736d96a3c2e0bb0db372846f3dd",
    "support"
   ],
   "interfaces/cssom.idl": [
@@ -643609,7 +643739,7 @@
    "support"
   ],
   "tools/lint/lint.py": [
-   "3f43b373abe793e8854baa80d4ac127ed66d0d95",
+   "cf668faea6f5403ad7b8d67a191c918cb48c8c0e",
    "support"
   ],
   "tools/lint/tests/__init__.py": [
@@ -648589,7 +648719,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/sauce.py": [
-   "9aa484accd47d0d4cd864b19491174a775421d7a",
+   "02cc322aa35efb8db6c7a29ce5b95080f482124e",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat": [
@@ -648857,7 +648987,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [
-   "7e18a8b4379b338e7b6db65b17ca363a83cb1c89",
+   "4af5367a0387c91079aa90dc26a58808f1a936ea",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
@@ -659800,6 +659930,10 @@
    "f8fe65e520c4ed9dd0c8779fe55b76459571ec94",
    "testharness"
   ],
+  "workers/importscripts_mime.tentative.any.js": [
+   "04c63a3a5f6d9bd3b71d94142f65a1825358b8ed",
+   "testharness"
+  ],
   "workers/interfaces.worker.js": [
    "fc9f3606faee5aa65ceeae002e2c8398a4092109",
    "testharness"
@@ -660584,6 +660718,10 @@
    "0fb0ec228079de8dd15626fb3161b53d48c68112",
    "support"
   ],
+  "workers/support/imported_script.py": [
+   "88cd2285e82162679c0bcbcc1ff756c91c12a5a0",
+   "support"
+  ],
   "workers/support/name-as-accidental-global.js": [
    "f2c39ea715aa64a990eda923931969a890ce336d",
    "support"
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 8eff4a9c63e..1bdd2d71581 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
@@ -503,3 +503,9 @@
   [min-width length(ex) / values]
     expected: FAIL
 
+  [text-shadow shadow(shadow) / values]
+    expected: FAIL
+
+  [text-indent percentage(%) / values]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
index 5135a133e03..b2537ad7eaa 100644
--- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
@@ -1,31 +1,30 @@
 [transitions-animatable-properties-01.html]
-  expected: TIMEOUT
   [border-bottom-width intermediate]
     expected: FAIL
 
   [z-index intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [text-indent intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [border-color end]
     expected: FAIL
 
   [word-spacing intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [outline-width intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [vertical-align intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [right intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [min-width intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [background-position end]
     expected: FAIL
@@ -34,10 +33,10 @@
     expected: FAIL
 
   [top intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [font-weight intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [clip intermediate]
     expected: FAIL
@@ -49,170 +48,29 @@
     expected: FAIL
 
   [min-height intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [border-top-width intermediate]
     expected: FAIL
 
   [max-width intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [max-height intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [outline-offset intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [border-spacing intermediate]
     expected: FAIL
 
   [left intermediate]
-    expected: NOTRUN
+    expected: FAIL
 
   [bottom intermediate]
     expected: FAIL
 
-  [margin-right end]
-    expected: NOTRUN
-
-  [opacity end]
-    expected: NOTRUN
-
-  [padding-right end]
-    expected: NOTRUN
-
-  [width end]
-    expected: NOTRUN
-
-  [word-spacing end]
-    expected: NOTRUN
-
-  [max-height end]
-    expected: NOTRUN
-
-  [max-width end]
-    expected: NOTRUN
-
-  [outline-color end]
-    expected: NOTRUN
-
-  [text-indent end]
-    expected: NOTRUN
-
-  [height end]
-    expected: NOTRUN
-
-  [width intermediate]
-    expected: NOTRUN
-
-  [outline-offset end]
-    expected: NOTRUN
-
-  [margin-top end]
-    expected: NOTRUN
-
   [outline-width end]
-    expected: NOTRUN
-
-  [line-height end]
-    expected: NOTRUN
-
-  [padding-right intermediate]
-    expected: NOTRUN
-
-  [min-height end]
-    expected: NOTRUN
-
-  [margin-top intermediate]
-    expected: NOTRUN
-
-  [padding-left end]
-    expected: NOTRUN
-
-  [text-shadow intermediate]
-    expected: NOTRUN
-
-  [top end]
-    expected: NOTRUN
-
-  [font-weight end]
-    expected: NOTRUN
-
-  [font-size end]
-    expected: NOTRUN
-
-  [line-height intermediate]
-    expected: NOTRUN
-
-  [height intermediate]
-    expected: NOTRUN
-
-  [visibility intermediate]
-    expected: NOTRUN
-
-  [text-shadow end]
-    expected: NOTRUN
-
-  [margin-left end]
-    expected: NOTRUN
-
-  [letter-spacing intermediate]
-    expected: NOTRUN
-
-  [min-width end]
-    expected: NOTRUN
-
-  [right end]
-    expected: NOTRUN
-
-  [margin-left intermediate]
-    expected: NOTRUN
-
-  [margin-right intermediate]
-    expected: NOTRUN
-
-  [padding-left intermediate]
-    expected: NOTRUN
-
-  [padding-top end]
-    expected: NOTRUN
-
-  [letter-spacing end]
-    expected: NOTRUN
-
-  [margin-bottom end]
-    expected: NOTRUN
-
-  [opacity intermediate]
-    expected: NOTRUN
-
-  [vertical-align end]
-    expected: NOTRUN
-
-  [padding-top intermediate]
-    expected: NOTRUN
-
-  [padding-bottom intermediate]
-    expected: NOTRUN
-
-  [visibility end]
-    expected: NOTRUN
-
-  [left end]
-    expected: NOTRUN
-
-  [outline-color intermediate]
-    expected: NOTRUN
-
-  [padding-bottom end]
-    expected: NOTRUN
-
-  [margin-bottom intermediate]
-    expected: NOTRUN
-
-  [font-size intermediate]
-    expected: NOTRUN
-
-  [z-index end]
-    expected: NOTRUN
+    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_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
deleted file mode 100644
index 51f8272a6de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_3.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_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 20865f493ec..9579b42287e 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -30,3 +30,6 @@
   [Set HTTP URL frame location.protocol to data]
     expected: FAIL
 
+  [Set HTTP URL frame location.protocol to x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html.ini
new file mode 100644
index 00000000000..cfaa7ef35ac
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html.ini
@@ -0,0 +1,4 @@
+[fieldset-content-before-legend.html]
+  [fieldset content before legend]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html.ini
new file mode 100644
index 00000000000..fb7222428f6
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html.ini
@@ -0,0 +1,2 @@
+[fieldset-overflow.html]
+  expected: FAIL
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 1de3f8d68b2..6b0817b6c56 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,3 +172,63 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [XHTML img usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#"]
+    expected: FAIL
+
+  [XHTML img usemap="hash-last#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="no-hash-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="no-hash-name"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#no-such-map"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="hash-last#"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [XHTML img usemap="#no-such-map"]
+    expected: FAIL
+
+  [XHTML img usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-id"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [XHTML img usemap=""]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap=""]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/goal-parameter.htm.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/goal-parameter.htm.ini
new file mode 100644
index 00000000000..826c1e44545
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/goal-parameter.htm.ini
@@ -0,0 +1,2 @@
+[goal-parameter.htm]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
index 51aba8bee6a..96f6053a6fb 100644
--- a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
+++ b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
@@ -11,10 +11,19 @@
   [response.formData() with input: a=b&c=d&]
     expected: FAIL
 
-  [response.formData() with input: &&&a=b&&&&c=d&]
+  [request.formData() with input: a=b&c=d&]
     expected: FAIL
 
-  [request.formData() with input: a=b&c=d&]
+  [request.formData() with input: &&&a=b&&&&c=d&]
+    expected: FAIL
+
+  [request.formData() with input: _charset_=windows-1252&test=%C2x]
+    expected: FAIL
+
+  [response.formData() with input: _charset_=windows-1252&test=%C2x]
+    expected: FAIL
+
+  [response.formData() with input: a=b&c=d]
     expected: FAIL
 
 
@@ -28,3 +37,12 @@
   [request.formData() with input: &&&a=b&&&&c=d&]
     expected: FAIL
 
+  [request.formData() with input: _charset_=windows-1252&test=%C2x]
+    expected: FAIL
+
+  [response.formData() with input: a=b&c=d&]
+    expected: FAIL
+
+  [response.formData() with input: &&&a=b&&&&c=d&]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/importscripts_mime.tentative.any.js.ini b/tests/wpt/metadata/workers/importscripts_mime.tentative.any.js.ini
new file mode 100644
index 00000000000..c1bdb07d8e0
--- /dev/null
+++ b/tests/wpt/metadata/workers/importscripts_mime.tentative.any.js.ini
@@ -0,0 +1,45 @@
+[importscripts_mime.tentative.any.sharedworker.html]
+  [importscripts_mime]
+    expected: FAIL
+
+
+[importscripts_mime.tentative.any.worker.html]
+  [importScripts() requires scripty MIME types: aaa/aaa is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: Text/html is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: zzz/zzz is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: application/octet-stream is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: text/potato is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: TEXT/HTML is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: potato/text is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: text/Html is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: TeXt/HtMl is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: text/html is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: application/xml is blocked.]
+    expected: FAIL
+
+  [importScripts() requires scripty MIME types: text/plain is blocked.]
+    expected: FAIL
+
+
+[importscripts_mime.tentative.any.serviceworker.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht
index 757283350f5..b49e941337e 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht
@@ -4,7 +4,7 @@
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style><![CDATA[
 body {
-	margin: 0;
+	margin: 1em;
 }
 body>div {
 	font-family: Ahem;
@@ -12,7 +12,7 @@ body>div {
 	line-height: 1em;
 	color: black;
 	background: yellow;
-	margin: 1em;
+	margin: 1em 0;
 	border: 1em solid gray;
 	width: 15em;
 	height: 2em;
@@ -34,7 +34,7 @@ div+div+div {
 </head>
 
 <body>
-
+<p>Pass if there is no red visible.</p>
 <div>
 	<div>xx xx</div>
 	<div class="a">x x</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht
index ab7d75644d8..4e4d94f8e83 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht
@@ -2,14 +2,15 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | column-rule</title>
+<title>CSS Multi-column Layout Test: 'column-rule' shorthand</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href=""/>
 <link rel="match" href="multicol-rule-shorthand-2-ref.xht"/>
-<meta name="flags" content=""/>
+<meta name="assert" content="Tests that column rules are not displayed for invalid properties and values."/>
+<meta name="flags" content="invalid"/>
 <style type="text/css"><![CDATA[
 body {
-	margin: 0;
+	margin: 1em;
 }
 body>div {
 	font-family: Ahem;
@@ -17,36 +18,22 @@ body>div {
 	line-height: 1em;
 	color: black;
 	background: yellow;
-	margin: 1em;
+	margin: 1em 0;
 	border: 1em solid gray;
 	width: 15em;
-	orphans: 1;
-	widows: 1;
 
 	column-count: 4;
 	column-gap: 1em;
 	column-rule: solid blue 1em;
-	column-rule: normal red 1em;
-	column: normal red 1em;
-}
-span {
-	background: blue;
-	position: absolute;
-	top: 0;
-	left: 3em;
-	height: 2em;
-	width: 1em;
-}
-span+span {
-	left: 7em;
-}
-span+span+span {
-	left: 11em;
+	column-rule: normal red 1em; /* invalid: 'normal' is not a 'border-style' */
+	column: normal red 1em; /* invalid: 'column' is not a valid property name; 'normal' can only apply to 'column-gap' */
 }
+
 ]]></style>
 </head>
 
 <body>
+<p>Pass if there is no red visible.</p>
 
 <div>
 	xx xx
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht
index 926bb66423e..dddb96880af 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht
@@ -6,23 +6,17 @@
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
   <meta name="flags" content="ahem" />
   <style type="text/css"><![CDATA[
-  body
+  div
   {
   font: 1.25em/1 Ahem;
   width: 30em;
-  }
-
-  div
-  {
   background-color: yellow;
   color: black;
-  orphans: 1;
-  widows: 1;
   }
   ]]></style>
  </head>
  <body>
-
+  <p>Test passes if it is identical to the reference.</p>
   <div>d da&nbsp; d da&nbsp; d da&nbsp; d da&nbsp; d da&nbsp;<br />
 
   dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp;<br />
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht
index 84cf1ff893c..02cbf9b4f26 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht
@@ -4,22 +4,17 @@
   <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-number-and-width-of-columns" title="The number and width of columns" />
   <link rel="match" href="multicol-width-001-ref.xht" />
+  <meta name="assert" content="Tests that column-width is calculated correctly."/>
   <meta name="flags" content="ahem" />
   <style type="text/css"><![CDATA[
-  body
+  div
   {
   font: 1.25em/1 Ahem;
   width: 30em;
-  }
-
-  div
-  {
   background-color: yellow;
   color: black;
-  orphans: 1;
-  widows: 1;
 
   column-gap: 0;
   column-width: 6em;
@@ -27,6 +22,7 @@
   ]]></style>
  </head>
  <body>
+  <p>Test passes if it is identical to the reference.</p>
   <div>
 	d da dam dame damer
 	d da dam dame damer
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht
index 59d54cadccd..68e10339a1c 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht
@@ -20,6 +20,7 @@
   ]]></style>
  </head>
  <body>
+  <p>Test passes if there are two black bars and two blue bars with a yellow stripe to the right of each bar, matching reference.</p>
   <table>
     <tr>
       <td><img src="support/black20x20.png" width="40" height="40" alt="Image download support must be enabled" /></td>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht
index f838020e427..78a14959058 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht
@@ -4,8 +4,9 @@
   <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-number-and-width-of-columns" title="The number and width of columns" />
   <link rel="match" href="multicol-width-002-ref.xht" />
+  <meta name="assert" content="Tests that column-width is calculated correctly."/>
   <meta name="flags" content="ahem" />
   <style type="text/css"><![CDATA[
   div
@@ -14,8 +15,6 @@
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
-  orphans: 1;
-  widows: 1;
   width: 12em;
 
   column-gap: 0;
@@ -26,6 +25,7 @@
   ]]></style>
  </head>
  <body>
+ <p>Test passes if there are two black bars and two blue bars with a yellow stripe to the right of each bar, matching reference.</p>
   <div>
   bl ac bl ac
     <span>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht
index a05a32d8bbb..0e91866163b 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht
@@ -4,9 +4,10 @@
   <title>CSS Multi-column Layout Test: column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model" title="The Multi-column Model" />
   <link rel="match" href="multicol-width-002-ref.xht" />
   <meta name="flags" content="ahem" />
+  <meta name="assert" content="Test to check that the multicol container and not the column box becomes the containing box"/>
   <style type="text/css"><![CDATA[
   div#multi-column
   {
@@ -15,11 +16,8 @@
   color: black;
   font: 1.25em/1 Ahem;
   height: 2em;
-  orphans: 1;
   position: relative;
-  widows: 1;
   width: 12em;
-
   column-width: 6em;
   column-gap: 0;
   }
@@ -33,23 +31,23 @@
   width: 2em;
   }
 
-  div#s2 {left: 3em;}
+  div#s2 {right: 7em;}
 
   div#s3
   {
   background-color: blue;
-  left: 6em;
+  right: 4em;
   }
 
   div#s4
   {
   background-color: blue;
-  left: 9em;
+  right: 1em;
   }
   ]]></style>
  </head>
  <body>
-
+  <p>Test passes if there are two black bars and two blue bars with a yellow stripe to the right of each bar, matching reference.</p>
   <div id="multi-column">
     <div></div>
     <div id="s2"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht
index c3e3b353028..8983e00fff0 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht
@@ -2,25 +2,25 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>multicolumn | column-width</title>
+<title>CSS Multi-column Layout Test: column-width (ch units)</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
-<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-number-and-width-of-columns"/>
 <link rel="match" href="multicol-width-ch-ref.xht"/>
 <meta name="flags" content=""/>
+<meta name="assert" value="Test that the ch unit can be used as a value for column-width."/>
 <style type="text/css"><![CDATA[
 .multicol {
   font: 1em monospace;
   width: 69ch;
   column-width: 13ch;
   column-gap: 1ch;
-  orphans: 1;
-  widows: 1;
   background: yellow;
 }
 ]]></style>
 </head>
 
 <body>
+  <p>Test passes if we have five columns with four lines in each. The final column should contain the words: million, billion, trillion.</p>
   <div class="multicol">
     one two three four
     five six seven eight
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht
index 133ad3e4b24..8adefc11e76 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht
@@ -23,6 +23,7 @@
 </head>
 
 <body>
+  <p>Test passes if we have five columns with four lines in each. The final column should contain the words: million, billion, trillion.</p>
   <div class="multicol-ref">
     <span>
       one two three four
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht
index eeec2dc3e66..3fde0610ac6 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht
@@ -4,30 +4,25 @@
   <title>CSS Multi-column Layout Test: column-count and column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-number-and-width-of-columns" title="3. The number and width of columns" />
   <link rel="match" href="multicol-width-001-ref.xht" />
+  <meta name="asset" content="Test that column-count and column-width are valid in combination"/>
   <meta name="flags" content="ahem" />
   <style type="text/css"><![CDATA[
-  body
+  div
   {
   font: 1.25em/1 Ahem;
   width: 30em;
-  }
-
-  div
-  {
   background-color: yellow;
   color: black;
-  orphans: 1;
-  widows: 1;
-
   column-count: 5;
   column-gap: 0;
-  column-width: 6em;
+  column-width: 5em;
   }
   ]]></style>
  </head>
  <body>
+ <p>Test passes if it is identical to the reference.</p>
   <div>
 	d da dam dame damer
 	d da dam dame damer
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht
index 9b9bffc8484..6de99956e3b 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht
@@ -4,8 +4,9 @@
   <title>CSS Multi-column Layout Test: column-count and column-width (basic)</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cc" title="3.2 'column-count'" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cc" title="3.2 'column-count'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
+  <meta name="asset" content="Test that column-count acts as a max when combined with column-width."/>
   <meta name="flags" content="ahem" />
   <style type="text/css"><![CDATA[
   html {background-color: white;}
@@ -22,10 +23,9 @@
   {
   background-color: yellow;
   color: black;
-
   column-count: 4;
   column-gap: 0;
-  column-width: 5em;
+  column-width: 4em; /* would create 5 columns if column-count was not acting as a max */
   }
   ]]></style>
  </head>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht
index a583e30f3d7..8664fc38253 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht
@@ -20,6 +20,7 @@
   ]]></style>
  </head>
  <body>
+  <p>This test passes is it is idential to the reference.</p>
   <table>
     <tr>
       <td><img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /></td>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht
index 76c9a57774c..83128b1f33b 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Multi-column Layout Test: invalid column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem invalid" />
   <meta name="assert" content="This test checks that 'column-width: bzzt' is invalid (generating a parsing error) and therefore will be ignored." />
@@ -15,18 +15,17 @@
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
-  orphans: 1;
-  widows: 1;
   width: 12em;
 
   column-gap: 0;
-  column-width: bzzt;
+  column-width: bzzt; /* this value is invalid */
   }
 
   span {color: blue;}
   ]]></style>
  </head>
  <body>
+ <p>This test passes is it is idential to the reference.</p>
   <div>
   bl ac
     <span>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht
index cb943a7fad3..04530e93d7c 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Multi-column Layout Test: large column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-23 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that a set 'column-width' may be wider (to fill the available space). In this test, the actual column-width will be increased to 12em." />
@@ -15,8 +15,6 @@
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
-  orphans: 1;
-  widows: 1;
   width: 12em;
 
   column-gap: 0;
@@ -27,6 +25,7 @@
   ]]></style>
  </head>
  <body>
+  <p>This test passes is it is idential to the reference.</p>
   <div>
   bl ac
     <span>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht
index 60528159db7..2efa3941d8f 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht
@@ -4,7 +4,7 @@
   <title>CSS Multi-column Layout Test: large column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-invalid-001-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that a set 'column-width' equal in width to the whole available space of the multi-column will use it all for its column box." />
@@ -15,8 +15,6 @@
   border: gray solid 1em;
   color: black;
   font: 1.25em/1 Ahem;
-  orphans: 1;
-  widows: 1;
   width: 12em;
 
   column-gap: 0;
@@ -27,6 +25,7 @@
   ]]></style>
  </head>
  <body>
+  <p>This test passes is it is idential to the reference.</p>
   <div>
   bl ac
     <span>
@@ -38,4 +37,4 @@
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht
index 5370b8033bc..dd7d515499d 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Multi-column Layout Test: negative column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-count-002-ref.xht" />
   <meta name="flags" content="ahem invalid" />
   <meta name="assert" content="This test checks that a set 'column-width' can not be negative." />
@@ -15,8 +15,6 @@
   border: black solid 1em;
   color: yellow;
   font: 1.25em/1 Ahem;
-  orphans: 1;
-  widows: 1;
   width: 19em;
 
   column-width: -100px;
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht
index eb427d1da4a..a862607a6ba 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht
@@ -20,6 +20,7 @@
   ]]></style>
  </head>
  <body>
+  <p>This test passes is it is idential to the reference.</p>
   <table>
     <tr>
       <td><img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /></td>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht
index c034815060b..8ef3bfa6ac0 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Multi-column Layout Test: narrow column-width</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-24 -->
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#cw" title="3.1. 'column-width'" />
   <link rel="match" href="multicol-width-small-001-ref.xht" />
   <meta name="flags" content="ahem" />
@@ -29,6 +29,7 @@
   ]]></style>
  </head>
  <body>
+  <p>This test passes is it is idential to the reference.</p>
   <div>
     <div>
       Bl ac
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transitions-animatable-properties-01.html b/tests/wpt/web-platform-tests/css/css-transitions/transitions-animatable-properties-01.html
index 06143d3061d..534f81839ac 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/transitions-animatable-properties-01.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/transitions-animatable-properties-01.html
@@ -5,6 +5,7 @@
     <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
     <title> CSS Transitions: Animatable CSS properties </title>
     <meta name="assert" content="Check that all animatable CSS properties are animatable and then accepted by the 'transition-property' property">
+    <meta name="timeout" content="long">
     <link rel="author" title="Daniel Glazman" href="mailto:daniel.glazman@disruptive-innovations.com">
     <link rel="help" href="http://www.w3.org/TR/css3-transitions/#transitions">
     <link rel="help" href="http://www.w3.org/TR/css3-transitions/#animatable-properties">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html
index bc32f202e2b..3979459838e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html
@@ -3,7 +3,7 @@
 <title>SVG writing modes values parsed as aliases</title>
 <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
 <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#svg-writing-mode">
-<link rel="match" href="reference/svg-aliasing-001-ref.html"
+<link rel="match" href="reference/svg-aliasing-001-ref.html">
 <meta name="assert" content="The legacy SVG writing mode values are parsed as simple aliases of the newer ones, and do not have side effects on bidi.">
 <meta name="flags" content="may"> <!-- "may" because the support for these values is optional-->
 
diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js b/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js
index 5144ef967f7..3d1bd9591db 100644
--- a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js
+++ b/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js
@@ -44,23 +44,26 @@ function runTest(config,qualifier) {
 
             assert_in_array(event.messageType, ['license-request', 'individualization-request']);
 
+            // Generate a license that expires 1 second from now.
             var expiration = Date.now().valueOf() + 1000;
             config.messagehandler(event.messageType, event.message, { expiration: expiration }).then(function(response) {
-                return event.target.update(response);
-            }).then(test.step_func(function() {
-                // License server may only have second granularity, so check
-                // that session expiration time is close to the desired value.
-                assert_approx_equals(event.target.expiration, expiration, 2000, "expiration attribute should equal provided expiration time");
-
-                // Since the expiration time is in the future, wait 5 seconds
-                // so that the license has expired before calling play().
+                // Wait 2 seconds before calling update() to ensure that the
+                // license has really expired. This is to avoid problems
+                // where the browser starts buffering frames as soon as a
+                // valid license is received.
                 test.step_timeout(function() {
-                    assert_greater_than(Date.now().valueOf(), expiration, "Starting play before license expired");
-                    _video.play();
-                    // Wait 2 seconds to ensure that the video does not play.
-                    test.step_timeout(function() { test.done(); }, 2000);
-                }, 5000);
-            })).catch(onFailure);
+                    event.target.update(response).then(function() {
+                        // License server may only have second granularity, so check
+                        // that session expiration time is close to the desired value.
+                        assert_approx_equals(event.target.expiration, expiration, 3000,
+                                             "expiration attribute should equal provided expiration time");
+                        assert_greater_than(Date.now().valueOf(), expiration, "Starting play before license expired");
+                        _video.play();
+                        // Wait 2 seconds to ensure that the video does not play.
+                        test.step_timeout(function() { test.done(); }, 2000);
+                    }).catch(onFailure);
+                }, 2000);
+            }).catch(onFailure);
         }
 
         function onPlaying(event) {
diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-a.html b/tests/wpt/web-platform-tests/hr-time/resources/unload-a.html
new file mode 100644
index 00000000000..40c1d061830
--- /dev/null
+++ b/tests/wpt/web-platform-tests/hr-time/resources/unload-a.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Helper page for ../unload-manual.html</title>
+</head>
+<body>
+  <script src="./unload.js"></script>
+  <script>
+    setupListeners("a", "./unload-b.html");
+  </script>
+  <button id="proceed">Click me!</button>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-b.html b/tests/wpt/web-platform-tests/hr-time/resources/unload-b.html
new file mode 100644
index 00000000000..7c2d90df275
--- /dev/null
+++ b/tests/wpt/web-platform-tests/hr-time/resources/unload-b.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Helper page for ../unload-manual.html</title>
+</head>
+<body>
+  <script src="./unload.js"></script>
+  <script>
+    setupListeners("b", "./unload-c.html");
+  </script>
+  <button id="proceed">Click me again!</button>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-c.html b/tests/wpt/web-platform-tests/hr-time/resources/unload-c.html
new file mode 100644
index 00000000000..731da9db758
--- /dev/null
+++ b/tests/wpt/web-platform-tests/hr-time/resources/unload-c.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Helper page for ../unload-manual.html</title>
+</head>
+<body>
+  <script src="./unload.js"></script>
+  <script>
+    setupListeners("c", null);
+  </script>
+  <button id="proceed">Click me, one last time!</button>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload.js b/tests/wpt/web-platform-tests/hr-time/resources/unload.js
new file mode 100644
index 00000000000..ab6b121c2b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/hr-time/resources/unload.js
@@ -0,0 +1,51 @@
+const syncDelay = ms => {
+  const start = performance.now();
+  let elapsedTime;
+  do {
+    elapsedTime = performance.now() - start;
+  } while (elapsedTime < ms);
+};
+
+const markTime = (docName, lifecycleEventName) => {
+  // Calculating these values before the below `mark` invocation ensures that delays in
+  // reaching across to the other window object doesn't interfere with the correctness
+  // of the test.
+  const dateNow = Date.now();
+  const performanceNow = performance.now();
+
+  window.opener.mark({
+    docName,
+    lifecycleEventName,
+    performanceNow: performanceNow,
+    dateNow: dateNow
+  });
+};
+
+const setupUnloadPrompt = (docName, msg) => {
+  window.addEventListener("beforeunload", ev => {
+    markTime(docName, "beforeunload");
+    return ev.returnValue = msg || "Click OK to continue test."
+  });
+};
+
+const setupListeners = (docName, nextDocument) => {
+  window.addEventListener("load", () => {
+    markTime(docName, "load");
+    document.getElementById("proceed").addEventListener("click", ev => {
+      ev.preventDefault();
+      if (nextDocument) {
+        document.location = nextDocument;
+      } else {
+        window.close();
+      }
+    })
+  });
+
+  setupUnloadPrompt(docName);
+
+  window.addEventListener("unload", () => {
+    markTime(docName, "unload");
+    if (docName !== "c") { syncDelay(1000); }
+  });
+};
+
diff --git a/tests/wpt/web-platform-tests/hr-time/unload-manual.html b/tests/wpt/web-platform-tests/hr-time/unload-manual.html
new file mode 100644
index 00000000000..18c4e0dc327
--- /dev/null
+++ b/tests/wpt/web-platform-tests/hr-time/unload-manual.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>time origin value manual test</title>
+  <link rel="help" href="https://w3c.github.io/hr-time/#time-origin-1">
+  <link rel="prefetch" href="./resources/unload-a.html">
+  <link rel="prefetch" href="./resources/unload-b.html">
+  <link rel="prefetch" href="./resources/unload-c.html">
+</head>
+<body>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+
+    const ACCEPTABLE_VARIANCE = 400; // ms
+
+    const isRoughlyEqual = (a, b) => Math.abs(a - b) < ACCEPTABLE_VARIANCE;
+
+    const timings = { a: {}, b: {}, c: {} };
+    const t = async_test("hr-time time origin");
+
+    window.mark = msg => {
+      timings[msg.docName][msg.lifecycleEventName] = {
+        performanceNow: msg.performanceNow,
+        dateNow: msg.dateNow
+      };
+
+      if (msg.docName === "c" && msg.lifecycleEventName === "unload") {
+        setTimeout(makeAssertions, 0);
+      }
+    };
+
+    function makeAssertions () {
+      t.step(() => {
+        const loadTimeBetweenAandB = timings.b.load.dateNow - timings.a.unload.dateNow;
+        const loadTimeBetweenBandC = timings.c.load.dateNow - timings.b.unload.dateNow;
+
+        assert_true(
+          isRoughlyEqual(loadTimeBetweenAandB, timings.b.load.performanceNow),
+          "Document in reused window's time origin should be time of close of pop-up box."
+        );
+        assert_true(
+          isRoughlyEqual(loadTimeBetweenBandC, timings.c.load.performanceNow),
+          "Document in reused window's time origin should be time of close of pop-up box."
+        );
+        assert_true(
+          !isRoughlyEqual(timings.a.unload.performanceNow, 0),
+          "Time origin during unload event should match that of rest of document."
+        );
+        assert_true(
+          !isRoughlyEqual(timings.b.unload.performanceNow, 0),
+          "Time origin during unload event should match that of rest of document."
+        );
+        assert_true(
+          !isRoughlyEqual(timings.c.unload.performanceNow, 0),
+          "Time origin during unload event should match that of rest of document."
+        );
+      });
+      t.done();
+    }
+  </script>
+
+  <h2>Description</h2>
+  <p>This test validates the behavior of <code>performance.now()</code> with respect to its time origin.</p>
+  <div id="log">
+   <h2>Manual Test Steps</h2>
+   <ol>
+    <li><a href="resources/unload-a.html" target="_blank">Click here</a>
+   </ol>
+  </div>
+</body>
+<html>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html
new file mode 100644
index 00000000000..4abd9ce533d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<title>fieldset content before legend</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<fieldset id=test>
+  X
+  <legend>legend</legend>
+  Y
+</fieldset>
+<fieldset id=ref>
+  <legend>legend</legend>
+  X Y
+</fieldset>
+<script>
+  test(() => {
+    const testElm = document.getElementById('test');
+    const refElm = document.getElementById('ref');
+    assert_equals(testElm.clientHeight, refElm.clientHeight);
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html
new file mode 100644
index 00000000000..d9b36e530b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Reference for fieldset overflow</title>
+<style>
+.fieldset, .legend {
+  border: 1em solid;
+  background: lime;
+}
+.fieldset {
+  height: 1em;
+  margin-top: 2em;
+}
+.legend {
+  height: 1em;
+  width: 5em;
+  line-height: 1;
+  margin-top: -4em;
+  margin-left: 1em;
+}
+</style>
+<p>There should be no red.</p>
+<div class=fieldset>
+</div>
+<div class=legend></div>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html
new file mode 100644
index 00000000000..2599f2f0fa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<title>fieldset overflow</title>
+<link rel=match href=fieldset-overflow-ref.html>
+<style>
+fieldset, legend {
+  border: 1em solid;
+  margin: 0;
+  padding: 0;
+  background: lime
+}
+fieldset {
+  overflow: auto;
+  height: 2em;
+}
+legend {
+  height: 1em;
+  width: 5em;
+}
+div {
+  background: red;
+  height: 2em;
+}
+
+</style>
+<p>There should be no red.</p>
+<fieldset>
+ <legend></legend>
+ <div></div>
+ <div id=last></div>
+</fieldset>
+<script>
+ document.getElementById('last').scrollIntoView();
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/goal-parameter.htm b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/goal-parameter.htm
new file mode 100644
index 00000000000..fe4d6759b91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/goal-parameter.htm
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Goal Parameter on JavaScript MIME</title>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+        <meta description="This test checks the Async property on a dynamically-created script element. By default it should be true." />
+        <link rel="author" title="" href="http://www.microsoft.com/" />
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-async"/>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+      <script type="module">
+
+        function makeTest({
+          fileName,
+          scriptType,
+          contentType,
+          shouldLoad
+        }) {
+          const elem = Object.assign(document.createElement("script"), {
+            type: scriptType,
+            src: `./serve-with-content-type.py?fn=${scriptType === "module" ? "is-module-goal.mjs" : "is-script-goal.js"}&ct=${contentType}`
+          });
+          const name = `${shouldLoad ? "Loads" : "Errors on"} type=${scriptType} when given content-type=${decodeURIComponent(contentType)}`;
+          const t = async_test(name);
+          if (!shouldLoad) {
+            elem.onload = t.unreached_func("Script should not load.");
+            elem.onerror = t.step_func_done();
+          } else {
+            elem.onload = t.step_func_done();
+            elem.onerror = t.unreached_func("Script should load.");
+          }
+          document.body.appendChild(elem);
+        }
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fhtml%3Bgoal=script',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=%20script',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=script%20',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fhtml%3Bgoal=module',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=%20module',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=module%20',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=%22%20module%22',
+          shouldLoad: false
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=script',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=SCRIPT',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3BGOAL=script',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3BGoal=Script',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3BgOal=script',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=scrIpt',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=%22script%22',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'text/javascript',
+          contentType: 'text%2Fjavascript%3Bgoal=%22%5Cs%5Cc%5Cr%5Ci%5Cp%5Ct%22',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=%22%5Cm%5Co%5Cd%5Cu%5Cl%5Ce%22',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=module',
+          shouldLoad: true
+        });
+        makeTest({
+          scriptType: 'module',
+          contentType: 'text%2Fjavascript%3Bgoal=%22module%22',
+          shouldLoad: true
+        });
+      </script>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs
new file mode 100644
index 00000000000..b533fc2e906
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs
@@ -0,0 +1 @@
+import "./serve-with-content-type.py?fn=is-module-goal.mjs&ct=text%2Fjavascript%3Bgoal=module";
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-script-goal.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-script-goal.js
new file mode 100644
index 00000000000..069363dd400
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-script-goal.js
@@ -0,0 +1,3 @@
+with ({}) {
+  ;
+};
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
index 0213a4090c7..2b5b381dfa4 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
@@ -3,7 +3,7 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: CSSOM View Module (https://drafts.csswg.org/cssom-view/)
 
-enum ScrollBehavior { "auto", "instant", "smooth" };
+enum ScrollBehavior { "auto", "smooth" };
 
 dictionary ScrollOptions {
     ScrollBehavior behavior = "auto";
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index 3f43b373abe..cf668faea6f 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -216,7 +216,8 @@ def check_css_globally_unique(repo_root, paths):
         elif source_file.name_is_reference:
             ref_files[source_file.name].add(path)
         else:
-            test_files[source_file.name].add(path)
+            name = source_file.name.replace('-manual', '')
+            test_files[name].add(path)
 
     errors = []
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
index 9aa484accd4..02cc322aa35 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
@@ -133,6 +133,7 @@ class SauceConnect():
         self.sauce_key = kwargs["sauce_key"]
         self.sauce_tunnel_id = kwargs["sauce_tunnel_id"]
         self.sauce_connect_binary = kwargs.get("sauce_connect_binary")
+        self.sauce_init_timeout = kwargs.get("sauce_init_timeout")
         self.sc_process = None
         self.temp_dir = None
         self.env_config = None
@@ -172,12 +173,9 @@ class SauceConnect():
             ",".join(self.env_config.domains_set)
         ])
 
-        # Timeout config vars
-        max_wait = 30
-
         tot_wait = 0
         while not os.path.exists('./sauce_is_ready') and self.sc_process.poll() is None:
-            if tot_wait >= max_wait:
+            if tot_wait >= self.sauce_init_timeout:
                 self.quit()
 
                 raise SauceException("Sauce Connect Proxy was not ready after %d seconds" % tot_wait)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 7e18a8b4379..4af5367a038 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -287,6 +287,11 @@ scheme host and port.""")
     sauce_group.add_argument("--sauce-connect-binary",
                              dest="sauce_connect_binary",
                              help="Path to Sauce Connect binary")
+    sauce_group.add_argument("--sauce-init-timeout", action="store",
+                             type=int, default=30,
+                             help="Number of seconds to wait for Sauce "
+                                  "Connect tunnel to be available before "
+                                  "aborting")
 
     webkit_group = parser.add_argument_group("WebKit-specific")
     webkit_group.add_argument("--webkit-port", dest="webkit_port",
diff --git a/tests/wpt/web-platform-tests/workers/importscripts_mime.tentative.any.js b/tests/wpt/web-platform-tests/workers/importscripts_mime.tentative.any.js
new file mode 100644
index 00000000000..04c63a3a5f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/importscripts_mime.tentative.any.js
@@ -0,0 +1,52 @@
+// META: global=!window,worker
+//
+// Tentative test for https://github.com/whatwg/html/issues/3255
+
+let test_cases = [
+  // Supported mimetypes:
+  ["text/javascript", true],
+  ["application/javascript", true],
+  ["text/ecmascript", true],
+
+  // Blocked mimetpyes:
+  ["image/png", false],
+  ["text/csv", false],
+  ["video/mpeg", false],
+
+  // Legacy mimetypes:
+  ["text/html", false],
+  ["text/plain", false],
+  ["application/xml", false],
+  ["application/octet-stream", false],
+
+  // Potato mimetypes:
+  ["text/potato", false],
+  ["potato/text", false],
+  ["aaa/aaa", false],
+  ["zzz/zzz", false],
+
+  // Parameterized mime types:
+  ["text/javascript; charset=utf-8", true],
+  ["text/javascript;charset=utf-8", true],
+  ["text/javascript;bla;bla", true],
+  ["text/csv; charset=utf-8", false],
+  ["text/csv;charset=utf-8", false],
+  ["text/csv;bla;bla", false],
+
+  // Funky capitalization:
+  ["Text/html", false],
+  ["text/Html", false],
+  ["TeXt/HtMl", false],
+  ["TEXT/HTML", false],
+];
+
+for (var test_case of test_cases) {
+  test(t => {
+    let import_url = "/workers/support/imported_script.py?mime=" + test_case[0];
+    if (test_case[1]) {
+      assert_equals(undefined, importScripts(import_url));
+    } else {
+      assert_throws("NetworkError", _ => { importScripts(import_url) })
+    }
+  }, "importScripts() requires scripty MIME types: " + test_case[0] + " is " + (test_case[1] ? "allowed" : "blocked") + ".");
+}
diff --git a/tests/wpt/web-platform-tests/workers/support/imported_script.py b/tests/wpt/web-platform-tests/workers/support/imported_script.py
new file mode 100644
index 00000000000..88cd2285e82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/support/imported_script.py
@@ -0,0 +1,2 @@
+def main(request, response):
+    return [('Content-Type', request.GET['mime'])], ""