Add more tests and updated email regex