Fixed: test mocks to match current API.