Fixed test to be in line with code changes