modified email-service test file