ModelGenerator Tests modified to reflect class changes