Fixed test cases
Merge