Fixed test case failures