Fixed test after new functionality