Mocking fixes