Improved mocks