Tests from isemail
Change logic