Fixed failing mailer tests