Streamline tests, better email regex