fix broken tests which are caused by fast restart refactoring