Sonar Eclipse

Improve connection test mechanism