Fix rspec version, rollback User model changes
Rewrite specs to match old examples