Improve test case!