Fix welcome email and add test