Cleanup and make Sensiolabs Insight happy
Fixed phpunit