Rectifications on mapstack::iterator. More tests