Add test for email and change regex