SearchModel builders are made internal to have access from tests
All tests are adapted fro category builders