Move to rspec mocks