Add a few more test cases