Merge "Fix non isolated tests." into rvc-dev