Fix email address regex, add more tests