Added more test cases