Make badge spec more robust; check all badges