Add MailService and test code