Merge pull request #1024 from TheBlueMatt/2021-07-always-connect-in-tests