Added a mail test. Still needs more work