Merge "Fixing test flackiness." into rvc-dev