Fixed up a bunch of problems with the download test