ModelGenerator Tests modified to reflect class changes
ModelGenerator Tests modified to reflect class changes