Update ClosingIteratorTest after Andres' cleanup task refactor