added more test & email validation & user exist check