Spec fixes for Rspec 3