Topic/using temporary dirs

It turns out that @charleso and I both want to clean up the tests using "using".