Sync updates to Mozilla tests.

Import from revision https://hg.mozilla.org/mozilla-central/rev/b65294b69a5b