B-48400 Patched oversight for metrics service auto-wiring, added tests