Enhance test for reusability