modified and added some rspec