Merge "Fix tests" into rvc-dev