add iterator, rename tests