All restart tests working (and passing test)