Fix broken index
Full integration tests