Refactor user tests, model for better email validation