Updated tests and added comments on Indexer direction