Fix tests to pass under rspec 3