Merge "Test Week - Add more coverage for Folder.java" into main