Fix iterator and tests to work with new naming and with actual new formats emitted from talking books