Improve test cases.