mocks now re-aligned to latest changes, solves test failure