FIX: Fix test
FIX: Fix downloading problem