Fixed test cases...