Update OverlayTest to improve focusDrawing