Moved phpunit to require-dev, sorted out tabs