Fix a failing test after refactoring