review feedback, fix persistence, fix test