Fix and merge search scenarios, run them on travis