Fix for FileTypeFilterIteratorTest
Cleaning up a few more tests