revert test changes
More fixes for restart tests and disable usershutdown tests