Topic/using temporary dirs

It turns out that @charleso and I both want to clean up the tests using "using".
I know this was here before, but almost seems like it would be cleaner to have two tests here, the base case and one for just testing `next` returns None?