add more persistence tests
Merge branch 'persistence' into development