User_spec.rb & Minor Changes