Upgrading tests, mailer tests