Fix the tests, use a LimitIterator.