Enhance test case for reusability