Enhance testing