Merge "Add unit test for FolderNameInfosTest" into main