Move bigram indexer to own file, add tests