Updated Email unit and integration tests.