Change some of the existing tests to use Mocks