Updates and cleanups to get tests and CI passing green#163

jeff-sqds wants to merge 2 commits intomainSquads-Protocol/v4:mainfrom

chore/green-buildSquads-Protocol/v4:chore/green-buildCopy head branch name to clipboard