Added FactoryGirl and refactored the badges.