More work around RegexIterator. Moved tests now pass. =)