Add dountil to fail on max retries completed scenario