Add test path to autoloader in PHPUnit bootstrap
Refactor test classes