Added test spec, refactored downloader variables.