Beefing up email tests