cherry-picking a commit; just ensure connection class gets reassigned if...

... a test fails