Merge branch 'jc/dir-iterator-test-fix'