Minor changes to test-persistance