Added Model Generator tests