Add indexer unit testing