Fix iterator tests (again).