Merge "Remove dead or unnecessary unit tests" into rvc-dev