Cleaning up and updating PHPUnit