DebugInfo: further improvements to test following up on r203329