Merge "Adds tests for popup menu" into main