Added futher test case and did some code formatting along with
restructuring of test package.