Add modelbuilder test