Fixed some restart tests
stash