Better email validation and tests