Massive improvements in CompositeSpliterator and CompositeSpliteratorTest