Expand on rspec model tests, start user integration testing