Merge pull request #2813 from dstftw/test-real-download-improvement