Fixing tests & exporting the mailer