A little more cleaning on PopupTestContext