Merge "Move some other functional tests to functional" into rvc-dev