repaired all persistence tests