Fixes tests for mailer