Make email, phone tests pass