Improve mock.