fixed tests and downloading hangs