Better looking badges
Clean up on tests