disk persistence fix, updated test