Fixed test broken by refactor