Slightly improve code for downloading test data