Fix test broken by previous refactoring