Add further email validation and tests