Improve initial guess on the output parameters: They have dimension
mass^2, so the initial guess should reflect this.
Add missing flags to test program
Rename generated model class files to match the contained class