Working on test connection feature