Improving test setup/teardown a little.