Update user.rb and user_spec.rb