Fix tests for persistence