Fixed original tests to work with PHPUnit