Anil - Fixed test cases