fixed mocks and scale issue