Break email sending into methods
Assert on more email fields