fix tests in core that needed serving-root