Fixed test broken by refactoring