Fixed test cases to the changes made
Merge remote-tracking branch 'origin/master'