WIP - Update indexer tests for new interface