Improve test case