add email classes and tests