Update testing and coverage for stability