Improve test cases