core-5807 fix unit tests for new search query builder.