Improve snapshot/restore test speed