fix unit test failures from zerorestart changes