Badges and more tests