Ensure that expect_snapshot() registers restart
#2271
Merged
expect_snapshot() registers restart
#2271