Updated to newer rspec syntax