Merge updates on tests.

http://hg.mozilla.org/mozilla-central/rev/4edf38716550