Updated user_spec.rb, refactors tests for User model #18