added multiple connection test and refactored