Update test to be smarter about image download