Fixed test case
Merged master