Rewrite bootstrap methods to make startup/shutdown of test suites smoother