Merge "Make internal printing tests compatible with helpers" into rvc-dev