Refactor a bunch of specs to use mocks