Clean up imports
Improve testability of Connections class
Allow invokation of provate methods in tests
Add some simple tests for Connections class