Changes to PHPUnit bootstrap