Fix iterator tests.