changed models, added rspec