Test fixes for new-style search.