Fixed test broken by bad merge