Fix iterator tests (once more)