Market tests (20 and 21 at the moment) now use the search facility in the market.