fix and test onf all snapshot save/resto workflow