adap search-tests to new fields