Fix restart command to correctly detect errors

Also updated a test baseline.