Fix up File Filters unit tests to work with FindInFiles refactoring. Clean up duplicate code.