Added to ComboSearch: andSearch, more tests