Fix indexing test for new models