Cleaned up issues with `phpunit` 4.2.x