Persistence test cleanup

The diff is much smaller than it looks, but the indentation was increased because of the nested describe commit (use -b with git to hide the widespace changes and get a better overview of the actual change)