Fixing mocks in model-impl tests.