Minor Adjustments to User.rb and Test Suite