Fixed tests to reflect model changes, added more tests to user_spec.rb

Do you need this since it's only used once?