Even more robust _resolve_condition shim - guess rel_name when needed
Fix test tripping on external warnings