Changes and tests for Downloaders