Fixes for the AsyncDownloader + Tests