Fixed test following refactor