More mocking improvements