Move ComboBox tests to correct package

Change-Id: I2ad5164a637b2b4c96b46f30df036ccbc5cbcd66