ComboBoxValueInput test upgrade (#14292)

Change-Id: Id2158d0990f12940f2206095b8edc0946977f27d