Split multi-city search from return search
Change tests to use relative dates