conect retry and test improvements