Reworked persistence tests, and increased timout for buildbot.