Email service refactoring and stubbed out tests.