Refactoring some specs to try fixing new mailer issues on initial spec run.