Correct count for retries.
Correct class name for test.
Merge branch 'master' into gdrive