Merge: testmodel: what about docunits to test model-related services?