Ensure we test the correct connection instance.
Merge pull request #123 from square/jw/test-fixes

Ensure we test the correct connection instance.