Make WrappedIterator replacment work and tests pass
Merge pull request #1 from ojwb/java-fixes

Make WrappedIterator replacement work and tests pass