Merge "Add a unit test for the close button on the caption" into main