Added yet more test cases.