Added even more test cases.