Refactoring tests to new rspec syntax