Constructed tests for additional code coverage.  Refactored downloader code as result.