Fix condition reported by test -race.
Remove extraneous calls to Disconnect in tests.