add enabled-save-on-restart testing.