Improved mocking.