Fix additional connection/service manager tests after PR #319