Merge "Fix tests that fail because tracing is unavailable (as opposed to off)." into rvc-dev