Adding test and improving validation of users email