Fixed test case errors