Mailer fixing - testing