Fix a test.
Fix broken iterator paths.