updating User model and Tests