Granular connect progress, test fix

Co-authored-by: Copilot <[email protected]>