Fixed test failing test cases