Added more test cases.