new retry controller logic and some fixed tests
removed some more noop timeouts from tests
Merge branch 'refactor-retry-controller-to-match-discussed-behaviour'