Fix remaining tests for indexing change