Some improvement in restart_test.go Upstream-commit: 57142e89befe90977da6dce7762f9fcc70f28da1 Component: engine