Updating EmailService unit and integration tests.