This is changing `modeler` from a private singleton instance used only by this file to a public singleton instance stored in `ModelBuilder.defaultInstance`.

Isn't it enough to apply the changes below (i.e. let unit-tests require a different file), since there is still only one `modeler` instance used even with the old version of the code?