PHPUnit bootstrap file and minor fixes