Merge "Add test for Folder undoing behavior" into main