Update persistence
Update test
Update test