Merge "Refactor and improve LegacyFileAccessTest" into rvc-dev