Fix test setup/teardown more