Fix broken tests from my indexing refactoring