Make WrappedIterator replacement work and tests pass