Deleted few more things and added a template for the test cases.