Added restart mode test coverage