Enhance tests