Fixed test cases to pass