More options for UnloadCommand and more resilient test cases