Improvements to PHPUnit bootstrap