connection-manager -> connection
remove extra log
tons of tests, more refactor progress