Be more graceful about our tmpdir creation in cli tests