Fixed test cases which were broken by the previous change.