Refining combobox behavior, with tests