Merge "modify test due to behavior change" into rvc-dev