Added test cases. Not all test cases are passing as of yet