simplify test setup / teardown, make sure we are cleaning up and closing all temp dirs / files