Change test syntax and some mailer test variables