Convert more tests to use mocks