Fix mailer link
Fix rest of tests