Updated email regex and add complementing tests