cleanup in ConfigHierarchyTest