Better buffering download
fixing tests