Added retry delay persistence.
Tested retry delay persistence.
And fixed one flaky test.