Badges, More test, less dependencies