Fix regressions.
PersistentIndex in test.