Added more and more test cases