Refactor specs to use newer rspec syntax