Enhance testing libraries