Solving failed test cases. Kindly follow a new patch.