Added Testcases
Fixed Bugs