ConnectionTest fixes