Added Mailer and integration_test