bundle update and rspec fixes