fixed page id iterator
restructured tests