Fixed broken test cases
Fixed test cases