Added some more test cases.