Modifications on test case for robustness and addition of retry for cli connection