adding tests and mailclass