Quality, test improvements

• more use of iterators where it makes sense to do so (without adding overhead to small lists)
• improve test robustness