new version mocks y stubs