More options for UnloadCommand and more resilient test cases

/review @newtonry @chase-seibert