Switching to PHPUnit 4.x