Fix occasional index test first