Update tests and email regex