Modify test driver to use indexer