Upgrading to PHPUnit 3.8