add test connection, +
refactoring