Whitespaces
Fix email tests