Increased test coverage on driver and indexer.