popupPanel tests fixing II