change combo/button logic
 - add test combo