ENG-4536 Indexing seemingly working with unit test.