Add download timeout
Update tests