Fixing mocking problems