Move to our own mocking system