Conn 803

Updated to constructor injection for unit testing.