iterators done, improved testdriver