Change specs to use newer rspec syntax