Fix some persistence tests