Enhance test case