Move to all new rspec mocks syntax