Bug 930052 - Reduce exposure to launch() method inside tests.
Merge pull request #13829 from zacc/bug_930052_6

Bug 935052 - Reduce exposure to launch() method inside tests.