Fixing download tests
Minor reformatting