Internals Service test renamed and adapted