=per #3797 Fix failing persistence tests