Tweaks to Rspec tests