Merge branch 'master' into lesters/wire-in-stateless-onnx-rt

30 files changed, 152 insertions, 77 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 326bf577acc..2b72420614d 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -494,9 +494,8 @@ public class ModelProvisioningTest {
         Set<HostResource> clusterControllerHosts = admin.getClusterControllers().getContainers()
                                                         .stream().map(cc -> cc.getHostResource()).collect(Collectors.toSet());
         Set<HostResource> slobrokHosts = admin.getSlobroks().stream().map(Slobrok::getHost).collect(Collectors.toSet());
-        assertEquals(6, slobrokHosts.size());
-        assertTrue("Slobroks are assigned from container and cluster controller nodes",
-                   union(containerHosts, clusterControllerHosts).containsAll(slobrokHosts));
+        assertEquals(3, slobrokHosts.size());
+        assertTrue("Slobroks are assigned on cluster controller nodes", clusterControllerHosts.containsAll(slobrokHosts));
         assertTrue("Logserver is assigned from container nodes", containerHosts.contains(admin.getLogserver().getHost()));
         assertEquals("No in-cluster config servers in a hosted environment", 0, admin.getConfigservers().size());
         assertEquals("Dedicated admin cluster controllers when hosted", 3, admin.getClusterControllers().getContainers().size());
@@ -560,6 +559,40 @@ public class ModelProvisioningTest {
     }
 
     @Test
+    public void testSlobroksOnContainersIfNoContentClusters() {
+        String services =
+                "<?xml version='1.0' encoding='utf-8' ?>\n" +
+                "<services>" +
+                "  <admin version='4.0'/>" +
+                "  <container version='1.0' id='foo'>" +
+                "     <nodes count='10'/>" +
+                "  </container>" +
+                "</services>";
+
+        int numberOfHosts = 10;
+        VespaModelTester tester = new VespaModelTester();
+        tester.addHosts(numberOfHosts);
+        VespaModel model = tester.createModel(services, true);
+        assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
+
+        // Check container cluster
+        assertEquals(1, model.getContainerClusters().size());
+        Set<HostResource> containerHosts = model.getContainerClusters().get("foo").getContainers().stream()
+                                                .map(Container::getHost)
+                                                .collect(Collectors.toSet());
+        assertEquals(10, containerHosts.size());
+
+        // Check admin clusters
+        Admin admin = model.getAdmin();
+        Set<HostResource> slobrokHosts = admin.getSlobroks().stream().map(Slobrok::getHost).collect(Collectors.toSet());
+        assertEquals(3, slobrokHosts.size());
+        assertTrue("Slobroks are assigned from container nodes",
+                   containerHosts.containsAll(slobrokHosts));
+        assertTrue("Logserver is assigned from container nodes", containerHosts.contains(admin.getLogserver().getHost()));
+        assertEquals("No in-cluster config servers in a hosted environment", 0, admin.getConfigservers().size());
+    }
+
+    @Test
     public void testUsingNodesAndGroupCountAttributesWithoutDedicatedClusterControllers() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
@@ -602,9 +635,8 @@ public class ModelProvisioningTest {
         Set<HostResource> clusterControllerHosts = admin.getClusterControllers().getContainers()
                                                         .stream().map(cc -> cc.getHostResource()).collect(Collectors.toSet());
         Set<HostResource> slobrokHosts = admin.getSlobroks().stream().map(Slobrok::getHost).collect(Collectors.toSet());
-        assertEquals(6, slobrokHosts.size());
-        assertTrue("Slobroks are assigned from container and cluster controller nodes",
-                   union(containerHosts, clusterControllerHosts).containsAll(slobrokHosts));
+        assertEquals(3, slobrokHosts.size());
+        assertTrue("Slobroks are assigned on cluster controller nodes", clusterControllerHosts.containsAll(slobrokHosts));
         assertTrue("Logserver is assigned from container nodes", containerHosts.contains(admin.getLogserver().getHost()));
         assertEquals("No in-cluster config servers in a hosted environment", 0, admin.getConfigservers().size());
         assertEquals(3, admin.getClusterControllers().getContainers().size());
@@ -1613,7 +1645,7 @@ public class ModelProvisioningTest {
         tester.addHosts(6);
         VespaModel model = tester.createModel(services, true);
         assertEquals(6, model.getRoot().hostSystem().getHosts().size());
-        assertEquals(5, model.getAdmin().getSlobroks().size());
+        assertEquals(3, model.getAdmin().getSlobroks().size());
         assertEquals(2, model.getContainerClusters().get("foo").getContainers().size());
         assertEquals(1, model.getContentClusters().get("bar").getRootGroup().countNodes(true));
     }
@@ -2056,9 +2088,6 @@ public class ModelProvisioningTest {
                 "    </nodes>",
                 "    <engine>",
                 "      <proton>",
-                "        <resource-limits>",
-                "          <memory>0.92</memory>",
-                "        </resource-limits>",
                 "        <tuning>",
                 "          <searchnode>",
                 "            <flushstrategy>",
@@ -2084,7 +2113,6 @@ public class ModelProvisioningTest {
         assertEquals(2000, cfg.flush().memory().maxtlssize()); // from config override
         assertEquals(1000, cfg.flush().memory().maxmemory()); // from explicit tuning
         assertEquals((long) ((128 - reservedMemoryGb) * GB / 8), cfg.flush().memory().each().maxmemory()); // from default node flavor tuning
-        assertEquals(0.92, cfg.writefilter().memorylimit(), 0.0001); // from explicit resource-limits
     }
 
     private static ProtonConfig getProtonConfig(VespaModel model, String configId) {
@@ -2138,11 +2166,4 @@ public class ModelProvisioningTest {
         assertProvisioned(nodeCount, id, null, type, model);
     }
 
-    private Set<HostResource> union(Set<HostResource> a, Set<HostResource> b) {
-        Set<HostResource> union = new HashSet<>();
-        union.addAll(a);
-        union.addAll(b);
-        return union;
-    }
-
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java
index c2dd3e45dea..f475fbe6d78 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java
@@ -135,7 +135,7 @@ public class DocumentGraphValidatorTest {
     }
 
     private static Search createSearchWithName(String name, Search... parents) {
-        Search campaignSearch = new Search(name, null);
+        Search campaignSearch = new Search(name);
         SDDocumentType document = new SDDocumentType(name);
         campaignSearch.addDocument(document);
         document.setDocumentReferences(new DocumentReferences(Collections.emptyMap()));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
index e46208c770d..6b65303fe56 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java
@@ -23,14 +23,16 @@ import static org.junit.Assert.assertTrue;
  */
 public class DocumentReferenceResolverTest {
 
+    private static final String BAR = "bar";
+    private static final String FOO = "foo";
     @Rule
     public final ExpectedException exceptionRule = ExpectedException.none();
 
     @Test
     public void reference_from_one_document_to_another_is_resolved() {
         // Create bar document with no fields
-        Search barSearch = new Search();
-        SDDocumentType barDocument = new SDDocumentType("bar", barSearch);
+        Search barSearch = new Search(BAR);
+        SDDocumentType barDocument = new SDDocumentType(BAR, barSearch);
         barSearch.addDocument(barDocument);
 
         // Create foo document with document reference to bar and add another field
@@ -38,7 +40,7 @@ public class DocumentReferenceResolverTest {
                 ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
         AttributeUtils.addAttributeAspect(fooRefToBarField);
         SDField irrelevantField = new SDField("irrelevant_stuff", DataType.INT);
-        Search fooSearch = new Search();
+        Search fooSearch = new Search(FOO);
         SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch);
         fooDocument.addField(fooRefToBarField);
         fooDocument.addField(irrelevantField);
@@ -60,7 +62,7 @@ public class DocumentReferenceResolverTest {
         SDField fooRefToBarField = new SDField(
                 "bar_ref", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("bar")));
         AttributeUtils.addAttributeAspect(fooRefToBarField);
-        Search fooSearch = new Search();
+        Search fooSearch = new Search(FOO);
         SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch);
         fooDocument.addField(fooRefToBarField);
         fooSearch.addDocument(fooDocument);
@@ -76,14 +78,14 @@ public class DocumentReferenceResolverTest {
     @Test
     public void throws_exception_if_reference_is_not_an_attribute() {
         // Create bar document with no fields
-        Search barSearch = new Search();
+        Search barSearch = new Search(BAR);
         SDDocumentType barDocument = new SDDocumentType("bar", barSearch);
         barSearch.addDocument(barDocument);
 
         // Create foo document with document reference to bar
         SDField fooRefToBarField = new SDField
                 ("bar_ref", ReferenceDataType.createWithInferredId(barDocument.getDocumentType()));
-        Search fooSearch = new Search();
+        Search fooSearch = new Search(FOO);
         SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch);
         fooDocument.addField(fooRefToBarField);
         fooSearch.addDocument(fooDocument);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
index fcbb89b5c42..f12129155b1 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java
@@ -18,30 +18,33 @@ public class ImportedFieldsEnumeratorTest {
 
     @Test
     public void imported_fields_are_enumerated_and_copied_from_correct_search_instance() {
-        Search parentSearch = new Search();
-        SDDocumentType parentDocument = new SDDocumentType("parent", parentSearch);
+        String PARENT = "parent";
+        Search parentSearch = new Search(PARENT);
+        SDDocumentType parentDocument = new SDDocumentType(PARENT, parentSearch);
         var parentField = new SDField("their_field", DataType.INT);
         AttributeUtils.addAttributeAspect(parentField);
         parentDocument.addField(parentField);
         parentSearch.addDocument(parentDocument);
 
-        Search fooSearch = new Search();
+        String FOO = "foo";
+        Search fooSearch = new Search(FOO);
         SDField fooRefToParent = new SDField(
                 "foo_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType()));
         AttributeUtils.addAttributeAspect(fooRefToParent);
         var fooImports = fooSearch.temporaryImportedFields().get();
         fooImports.add(new TemporaryImportedField("my_first_import", "foo_ref", "their_field"));
         fooImports.add(new TemporaryImportedField("my_second_import", "foo_ref", "their_field"));
-        SDDocumentType fooDocument = new SDDocumentType("foo", fooSearch);
+        SDDocumentType fooDocument = new SDDocumentType(FOO, fooSearch);
         fooSearch.addDocument(fooDocument);
 
-        Search barSearch = new Search();
+        String BAR = "bar";
+        Search barSearch = new Search(BAR);
         SDField barRefToParent = new SDField(
                 "bar_ref", ReferenceDataType.createWithInferredId(parentDocument.getDocumentType()));
         AttributeUtils.addAttributeAspect(barRefToParent);
         var barImports = barSearch.temporaryImportedFields().get();
         barImports.add(new TemporaryImportedField("my_cool_import", "my_ref", "their_field"));
-        SDDocumentType barDocument = new SDDocumentType("bar", barSearch);
+        SDDocumentType barDocument = new SDDocumentType(BAR, barSearch);
         barSearch.addDocument(barDocument);
 
         var enumerator = new ImportedFieldsEnumerator(List.of(parentSearch, fooSearch, barSearch));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java
index 02ec597c3ed..84819439048 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java
@@ -33,7 +33,7 @@ public class RankProfileRegistryTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testRankProfileDuplicateNameIsIllegal() {
-        Search search = new Search("foo", null);
+        Search search = new Search("foo");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         RankProfile barRankProfile = new RankProfile("bar", search, rankProfileRegistry);
         rankProfileRegistry.add(barRankProfile);
@@ -42,7 +42,7 @@ public class RankProfileRegistryTest {
 
     @Test
     public void testRankProfileDuplicateNameLegalForOverridableRankProfiles() {
-        Search search = new Search("foo", null);
+        Search search = new Search("foo");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
 
         for (String rankProfileName : RankProfileRegistry.overridableRankProfileNames) {
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
index 0f83a4db98f..91e8640308a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java
@@ -38,7 +38,7 @@ public class RankProfileTestCase extends SchemaTestCase {
 
     @Test
     public void testRankProfileInheritance() {
-        Search search = new Search("test", null);
+        Search search = new Search("test");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType document = new SDDocumentType("test");
         SDField a = document.addField("a", DataType.STRING);
@@ -173,7 +173,7 @@ public class RankProfileTestCase extends SchemaTestCase {
                 "  rank-profile p1 {}\n" +
                 "  rank-profile p2 {}\n" +
                 "}");
-        builder.build(true, new BaseDeployLogger());
+        builder.build(true);
         Search search = builder.getSearch();
 
         assertEquals(4, registry.all().size());
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
index 47862a2611b..139dae65c63 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
@@ -21,7 +21,7 @@ public class EmptyRankProfileTestCase extends SchemaTestCase {
 
     @Test
     public void testDeriving() {
-        Search search = new Search("test", null);
+        Search search = new Search("test");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType doc = new SDDocumentType("test");
         search.addDocument(doc);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 770bea55af2..370315ad08b 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
+import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
@@ -103,7 +104,8 @@ public class ExportingTestCase extends AbstractExportingTestCase {
 
     @Test
     public void testRankExpression() throws IOException, ParseException {
-        assertCorrectDeriving("rankexpression");
+        assertCorrectDeriving("rankexpression", null,
+                new TestProperties().useExternalRankExpression(true), new TestableDeployLogger());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
index 130450e483d..b2cac8cd4c2 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java
@@ -23,7 +23,7 @@ public class IdTestCase extends AbstractExportingTestCase {
 
     @Test
     public void testExplicitUpperCaseIdField() {
-        Search search = new Search("test", null);
+        Search search = new Search("test");
         SDDocumentType document = new SDDocumentType("test");
         search.addDocument(document);
         SDField uri = new SDField("URI", DataType.URI);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
index 1b51fd354f3..c0a8a47e4ee 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
@@ -143,7 +143,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
     @Test
     public void testIndexSettingInheritance() {
         SDDocumentType parent = new SDDocumentType("parent");
-        Search parentSearch = new Search("parent", null);
+        Search parentSearch = new Search("parent");
         parentSearch.addDocument(parent);
         SDField prefixed = parent.addField("prefixed", DataType.STRING);
         prefixed.parseIndexingScript("{ index }");
@@ -151,7 +151,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
 
         SDDocumentType child = new SDDocumentType("child");
         child.inherit(parent);
-        Search childSearch = new Search("child", null);
+        Search childSearch = new Search("child");
         childSearch.addDocument(child);
 
         prefixed = (SDField)child.getField("prefixed");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java
index be720cbe4dd..2e36319bd8c 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java
@@ -30,7 +30,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase {
      */
     @Test
     public void testLiteralBoost() {
-        Search search=new Search("literalboost", null);
+        Search search=new Search("literalboost");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType document=new SDDocumentType("literalboost");
         search.addDocument(document);
@@ -62,7 +62,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase {
      */
     @Test
     public void testNonDefaultRankLiteralBoost() {
-        Search search=new Search("literalboost", null);
+        Search search=new Search("literalboost");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType document=new SDDocumentType("literalboost");
         search.addDocument(document);
@@ -88,7 +88,7 @@ public class LiteralBoostTestCase extends AbstractExportingTestCase {
     /** Tests literal boosts in two fields going to the same index */
     @Test
     public void testTwoLiteralBoostFields() {
-        Search search=new Search("msb", null);
+        Search search=new Search("msb");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType document=new SDDocumentType("msb");
         search.addDocument(document);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java
index 0c677456a87..f72f67f3711 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java
@@ -62,7 +62,7 @@ public class SearchOrdererTestCase extends SchemaTestCase {
     }
 
     private static Search createSchema(String name, Map<String, Search> schemas) {
-        Search search = new Search(name, null);
+        Search search = new Search(name);
         SDDocumentType document = new SDDocumentType(name);
         document.setDocumentReferences(new DocumentReferences(emptyMap()));
         search.addDocument(document);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
index 07d7405b1db..24d694cd442 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
@@ -72,7 +72,7 @@ public class SummaryMapTestCase extends SchemaTestCase {
     }
     @Test
     public void testPositionDeriving() {
-        Search search = new Search("store", null);
+        Search search = new Search("store");
         SDDocumentType document = new SDDocumentType("store");
         search.addDocument(document);
         String fieldName = "location";
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
index c03e915aa8b..364eb9dc014 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java
@@ -25,7 +25,7 @@ public class TypeConversionTestCase extends SchemaTestCase {
     /** Tests that exact-string stuff is not spilled over to the default index */
     @Test
     public void testExactStringToStringTypeConversion() {
-        Search search = new Search("test", null);
+        Search search = new Search("test");
         RankProfileRegistry rankProfileRegistry = RankProfileRegistry.createRankProfileRegistryWithBuiltinRankProfiles(search);
         SDDocumentType document = new SDDocumentType("test");
         search.addDocument(document);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
index 37b49955bbf..b813f08d49e 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
@@ -20,7 +20,7 @@ public class VsmFieldsTestCase {
 
     @Test
     public void reference_type_field_is_unsearchable() {
-        Search search = new Search("test", MockApplicationPackage.createEmpty());
+        Search search = new Search("test", MockApplicationPackage.createEmpty(), new TestableDeployLogger());
         search.addDocument(new SDDocumentType("test"));
         SDField refField = new TemporarySDField("ref_field", ReferenceDataType.createWithInferredId(TemporaryStructuredDataType.create("parent_type")));
         refField.parseIndexingScript("{ summary }");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
index defaf565a8b..83949ea6f8d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java
@@ -6,6 +6,7 @@ import com.yahoo.document.DataType;
 import com.yahoo.document.Field;
 import com.yahoo.searchdefinition.DocumentReference;
 import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.derived.TestableDeployLogger;
 import com.yahoo.searchdefinition.document.ImportedField;
 import com.yahoo.searchdefinition.document.ImportedFields;
 import com.yahoo.searchdefinition.document.ImportedSimpleField;
@@ -44,14 +45,14 @@ public class AddAttributeTransformToSummaryOfImportedFieldsTest {
     }
 
     private static Search createSearchWithDocument(String documentName) {
-        Search search = new Search(documentName, MockApplicationPackage.createEmpty());
+        Search search = new Search(documentName, MockApplicationPackage.createEmpty(), new TestableDeployLogger());
         SDDocumentType document = new SDDocumentType(documentName, search);
         search.addDocument(document);
         return search;
     }
 
     private static ImportedFields createSingleImportedField(String fieldName) {
-        Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty());
+        Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty(), new TestableDeployLogger());
         SDField targetField = new SDField("target_field", DataType.INT);
         DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch);
         ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java
index 7863c544b60..833dbc14a53 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java
@@ -153,7 +153,7 @@ public class IndexingScriptRewriterTestCase extends SchemaTestCase {
     private static ScriptExpression processField(SDField unprocessedField) {
         SDDocumentType sdoc = new SDDocumentType("test");
         sdoc.addField(unprocessedField);
-        Search search = new Search("test", null);
+        Search search = new Search("test");
         search.addDocument(sdoc);
         new Processing().process(search, new BaseDeployLogger(), new RankProfileRegistry(), new QueryProfiles(), true, false);
         return unprocessedField.getIndexingScript();
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java
index 7d6a8507dd3..ecafd7a4222 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java
@@ -10,6 +10,7 @@ import com.yahoo.document.TemporaryStructuredDataType;
 import com.yahoo.searchdefinition.DocumentReference;
 import com.yahoo.searchdefinition.DocumentReferences;
 import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.derived.TestableDeployLogger;
 import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.TemporaryImportedField;
@@ -29,7 +30,7 @@ public class ParentChildSearchModel {
     }
 
     protected Search createSearch(String name) {
-        Search result = new Search(name, app);
+        Search result = new Search(name, app, new TestableDeployLogger());
         result.addDocument(new SDDocumentType(name));
         return result;
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
index e6616ce0dd1..683242c1333 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java
@@ -4,6 +4,7 @@ package com.yahoo.searchdefinition.processing;
 import com.google.common.collect.ImmutableList;
 import com.yahoo.config.application.api.ApplicationPackage;
 import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter;
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.path.Path;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
@@ -62,7 +63,7 @@ class RankProfileSearchFixture {
                              String rankProfiles, String constant, String field)
             throws ParseException {
         this.queryProfileRegistry = queryProfileRegistry;
-        SearchBuilder builder = new SearchBuilder(applicationpackage, rankProfileRegistry, queryProfileRegistry);
+        SearchBuilder builder = new SearchBuilder(applicationpackage, new BaseDeployLogger(), rankProfileRegistry, queryProfileRegistry);
         String sdContent = "search test {\n" +
                            "  " + (constant != null ? constant : "") + "\n" +
                            "  document test {\n" +
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
index 12fe7e151c0..e3d81be6743 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java
@@ -384,7 +384,7 @@ public class RankingExpressionTypeResolverTestCase {
     @Test
     public void undeclaredQueryFeaturesAreAccepted() throws Exception {
         InspectableDeployLogger logger = new InspectableDeployLogger();
-        SearchBuilder builder = new SearchBuilder();
+        SearchBuilder builder = new SearchBuilder(logger);
         builder.importString(joinLines(
                 "search test {",
                 "  document test { ",
@@ -401,8 +401,8 @@ public class RankingExpressionTypeResolverTestCase {
                 "    }",
                 "  }",
                 "}"
-        ), logger);
-        builder.build(true, logger);
+        ));
+        builder.build(true);
         String message = logger.findMessage("The following query features");
         assertNull(message);
     }
@@ -410,7 +410,7 @@ public class RankingExpressionTypeResolverTestCase {
     @Test
     public void undeclaredQueryFeaturesAreAcceptedWithWarningWhenUsingTensors() throws Exception {
         InspectableDeployLogger logger = new InspectableDeployLogger();
-        SearchBuilder builder = new SearchBuilder();
+        SearchBuilder builder = new SearchBuilder(logger);
         builder.importString(joinLines(
                 "search test {",
                 "  document test { ",
@@ -427,8 +427,8 @@ public class RankingExpressionTypeResolverTestCase {
                 "    }",
                 "  }",
                 "}"
-        ), logger);
-        builder.build(true, logger);
+        ));
+        builder.build(true);
         String message = logger.findMessage("The following query features");
         assertNotNull(message);
         assertEquals("WARNING: The following query features used in 'my_rank_profile' are not declared in query profile types and " +
@@ -439,7 +439,7 @@ public class RankingExpressionTypeResolverTestCase {
     @Test
     public void noWarningWhenUsingTensorsWhenQueryFeaturesAreDeclared() throws Exception {
         InspectableDeployLogger logger = new InspectableDeployLogger();
-        SearchBuilder builder = new SearchBuilder();
+        SearchBuilder builder = new SearchBuilder(logger);
         QueryProfileType myType = new QueryProfileType("mytype");
         myType.addField(new FieldDescription("rank.feature.query(foo)",
                                              new TensorFieldType(TensorType.fromSpec("tensor(d[2])"))),
@@ -467,8 +467,8 @@ public class RankingExpressionTypeResolverTestCase {
                 "    }",
                 "  }",
                 "}"
-        ), logger);
-        builder.build(true, logger);
+        ));
+        builder.build(true);
         String message = logger.findMessage("The following query features");
         assertNull(message);
     }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
index c64dbcdef03..2ae6ffbf343 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java
@@ -1,6 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.processing;
 
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.searchdefinition.RankProfile;
@@ -84,7 +85,7 @@ public class RankingExpressionWithTransformerTokensTestCase {
                 "  document test {}\n" +
                 "  rank-profile my_profile inherits default {}\n" +
                 "}";
-        SearchBuilder searchBuilder = new SearchBuilder(application, rankProfileRegistry, queryProfileRegistry);
+        SearchBuilder searchBuilder = new SearchBuilder(application, new BaseDeployLogger(), rankProfileRegistry, queryProfileRegistry);
         searchBuilder.importString(sdContent);
         searchBuilder.build();
         Search search = searchBuilder.getSearch();
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
index 8861432d97b..0695ae6a249 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
@@ -2,16 +2,22 @@
 package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.collections.Pair;
+import com.yahoo.config.FileReference;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.searchdefinition.*;
+import com.yahoo.searchdefinition.RankProfile;
+import com.yahoo.searchdefinition.RankProfileRegistry;
+import com.yahoo.searchdefinition.SchemaTestCase;
+import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.derived.DerivedConfiguration;
 import com.yahoo.searchdefinition.derived.AttributeFields;
 import com.yahoo.searchdefinition.derived.RawRankProfile;
 import com.yahoo.searchdefinition.derived.TestableDeployLogger;
 import com.yahoo.searchdefinition.parser.ParseException;
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
+import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
index eecab3c03d7..b0c65b3ea76 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
@@ -21,7 +21,7 @@ public class ReservedRankingExpressionFunctionNamesTestCase {
     public void requireThatFunctionsWithReservedNamesIssueAWarning() throws ParseException {
         TestDeployLogger deployLogger = new TestDeployLogger();
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
-        SearchBuilder builder = new SearchBuilder(rankProfileRegistry);
+        SearchBuilder builder = new SearchBuilder(deployLogger, rankProfileRegistry);
         builder.importString(
                 "search test {\n" +
                         "    document test { \n" +
@@ -50,7 +50,7 @@ public class ReservedRankingExpressionFunctionNamesTestCase {
                         "        }\n" +
                         "    }\n" +
                         "}\n");
-        builder.build(true, deployLogger);
+        builder.build(true);
 
         assertTrue(deployLogger.log.contains("sigmoid") && deployLogger.log.contains("test_rank_profile"));
         assertTrue(deployLogger.log.contains("sigmoid") && deployLogger.log.contains("test_rank_profile_2"));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
index 8308b638497..6ab74ef2eae 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
@@ -195,7 +195,7 @@ public class TensorTransformTestCase extends SchemaTestCase {
                 "        }\n" +
                 "    }\n" +
                 "}\n");
-        builder.build(true, new BaseDeployLogger());
+        builder.build(true);
         Search s = builder.getSearch();
         RankProfile test = rankProfileRegistry.get(s, "test").compile(queryProfiles, new ImportedMlModels());
         List<Pair<String, String>> testRankProperties = new RawRankProfile(test,
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
index cec313f98d8..28e70130e75 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java
@@ -6,6 +6,7 @@ import com.yahoo.document.DataType;
 import com.yahoo.document.Field;
 import com.yahoo.searchdefinition.DocumentReference;
 import com.yahoo.searchdefinition.Search;
+import com.yahoo.searchdefinition.derived.TestableDeployLogger;
 import com.yahoo.searchdefinition.document.ImportedField;
 import com.yahoo.searchdefinition.document.ImportedFields;
 import com.yahoo.searchdefinition.document.ImportedSimpleField;
@@ -45,14 +46,14 @@ public class ValidateFieldTypesTest {
     }
 
     private static Search createSearchWithDocument(String documentName) {
-        Search search = new Search(documentName, MockApplicationPackage.createEmpty());
+        Search search = new Search(documentName, MockApplicationPackage.createEmpty(), new TestableDeployLogger());
         SDDocumentType document = new SDDocumentType(documentName, search);
         search.addDocument(document);
         return search;
     }
 
     private static ImportedFields createSingleImportedField(String fieldName, DataType dataType) {
-        Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty());
+        Search targetSearch = new Search("target_doc", MockApplicationPackage.createEmpty(), new TestableDeployLogger());
         SDField targetField = new SDField("target_field", dataType);
         DocumentReference documentReference = new DocumentReference(new Field("reference_field"), targetSearch);
         ImportedField importedField = new ImportedSimpleField(fieldName, documentReference, targetField);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java
index 27a32f3e754..f9ccdb1a2aa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentDatabaseChangeValidatorTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.application.validation.change.search;
 
 import com.yahoo.config.application.api.ValidationId;
-import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction;
 import org.junit.Test;
@@ -11,9 +10,9 @@ import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRefeedAction;
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newReindexAction;
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRestartAction;
-import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRefeedAction;
 
 public class DocumentDatabaseChangeValidatorTest {
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterResourceLimitsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterResourceLimitsTest.java
index da2d5e2e3a0..469e4649c14 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterResourceLimitsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterResourceLimitsTest.java
@@ -1,6 +1,11 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
+import com.yahoo.searchdefinition.derived.TestableDeployLogger;
+import com.yahoo.text.XML;
+import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -43,7 +48,7 @@ public class ClusterResourceLimitsTest {
             return this;
         }
         public ClusterResourceLimits build() {
-            var builder = new ClusterResourceLimits.Builder(enableFeedBlockInDistributor);
+            var builder = new ClusterResourceLimits.Builder(enableFeedBlockInDistributor, false, new BaseDeployLogger());
             builder.setClusterControllerBuilder(ctrlBuilder);
             builder.setContentNodeBuilder(nodeBuilder);
             return builder.build();
@@ -114,6 +119,29 @@ public class ClusterResourceLimitsTest {
                 new Fixture(true));
     }
 
+    @Test
+    // TODO: Change to expect exception being thrown when no one uses this in hosted
+    public void default_resource_limits_when_hosted_and_warning_is_logged() {
+        TestableDeployLogger logger = new TestableDeployLogger();
+        final boolean hosted = true;
+
+        ClusterResourceLimits.Builder builder = new ClusterResourceLimits.Builder(true, hosted, logger);
+        ClusterResourceLimits limits = builder.build(new ModelElement(XML.getDocument("<cluster id=\"test\">" +
+                                                       "  <tuning>\n" +
+                                                       "    <resource-limits>\n" +
+                                                       "      <memory>0.92</memory>\n" +
+                                                       "    </resource-limits>\n" +
+                                                       "  </tuning>\n" +
+                                                       "</cluster>")
+                                          .getDocumentElement()));
+
+        assertLimits(0.8, 0.8, limits.getClusterControllerLimits());
+        assertLimits(0.9, 0.9, limits.getContentNodeLimits());
+
+        assertEquals(1, logger.warnings.size());
+        assertEquals("Element resource-limits is not allowed, default limits will be used", logger.warnings.get(0));
+    }
+
     private void assertLimits(Double expCtrlDisk, Double expCtrlMemory, Double expNodeDisk, Double expNodeMemory, Fixture f) {
         var limits = f.build();
         assertLimits(expCtrlDisk, expCtrlMemory, limits.getClusterControllerLimits());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java
index b1bd44d93b4..22e38b30959 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java
@@ -1,6 +1,7 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.vespa.config.content.FleetcontrollerConfig;
@@ -22,9 +23,12 @@ public class FleetControllerClusterTest {
         MockRoot root = new MockRoot("", deployState);
         var clusterElement = new ModelElement(doc.getDocumentElement());
         return new ClusterControllerConfig.Builder("storage",
-                clusterElement,
-                new ClusterResourceLimits.Builder(enableFeedBlockInDistributor).build(clusterElement).getClusterControllerLimits()).
-                build(root.getDeployState(), root, clusterElement.getXml());
+                                                   clusterElement,
+                                                   new ClusterResourceLimits.Builder(enableFeedBlockInDistributor,
+                                                                                     false,
+                                                                                     new BaseDeployLogger())
+                                                           .build(clusterElement).getClusterControllerLimits())
+                .build(root.getDeployState(), root, clusterElement.getXml());
     }
 
     private ClusterControllerConfig parse(String xml) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
index bbf59fc66e4..bdae01d5e09 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
@@ -14,6 +14,7 @@ import com.yahoo.tensor.TensorType;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
+import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import org.junit.Test;
@@ -96,6 +97,10 @@ public class ModelEvaluationTest {
         cluster.getConfig(cb);
         RankingConstantsConfig constantsConfig = new RankingConstantsConfig(cb);
 
+        RankingExpressionsConfig.Builder ce = new RankingExpressionsConfig.Builder();
+        cluster.getConfig(ce);
+        RankingExpressionsConfig expressionsConfig = ce.build();
+
         OnnxModelsConfig.Builder ob = new OnnxModelsConfig.Builder();
         cluster.getConfig(ob);
         OnnxModelsConfig onnxModelsConfig = new OnnxModelsConfig(ob);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
index ea4b3db5ebb..66b60ec3782 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
@@ -40,7 +40,7 @@ public class SearchClusterTest {
     public void testSdConfigLogical() {
         // sd1
         SDDocumentType sdt1 = new SDDocumentType("s1");
-        Search search1 = new Search("s1", null);
+        Search search1 = new Search("s1");
         SDField f1 = new SDField("f1", DataType.STRING);
         f1.addAttribute(new Attribute("f1", DataType.STRING));
         f1.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f1"))));
@@ -49,7 +49,7 @@ public class SearchClusterTest {
 
         // sd2
         SDDocumentType sdt2 = new SDDocumentType("s2");
-        Search search2 = new Search("s2", null);
+        Search search2 = new Search("s2");
         SDField f2=new SDField("f2", DataType.STRING);
         f2.addAttribute(new Attribute("f2", DataType.STRING));
         f2.setIndexingScript(new ScriptExpression(new StatementExpression(new AttributeExpression("f2"))));