Merge "Refactor FilePathAccessTest"