Introduce a builder for model creators. Bring back some test coverage.

+review REVIEW-5204