Rework tests in indexing service to be more unit testy