Merge "Remove unnecessary old code from test" into rvc-dev