Fix and test ageorder iterator