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

You can remove this TODO