Beefed up ComboBox and added tests for it