Move to rspec mocks and stubs
Move to rspec mocks some more