Do real email address validation.
Some minor test refactorizings.