Reduce use of mocks in tests to increase clarity