Merge "Adding test for folder preview loading" into main