Currently, tests modify connections after already adding to the context. Since we've modified the public interface used for storing and modifying connections, the methods used in the test to setup connections require us to expose other methods to them as friend classes as a means for ease of testing. By changing the tests to only store connections in the context once, we'll be able to remove these extra methods and friend class statements.