Fix indexing tests to reflect changes