More Rspec 3 Fixes