Update draft tests to include retries.