JAL-2674 Rationalising iterators and retesting