Wrote new test cases and Increased code coverage from 44% to 84%

Wrote new test cases and Increased code coverage from 44% to 84%