update tests to not use so many mocks