Make retry not to be default - fixing bug
add code coverage