small improvements to multiple mocks