Fix mocks integration issues