Added more test cases and tie test case