Expand FinderIndexer tests