Test retry policy.
Minor/cosmetic changes.