Close #2350 Fixes generated model relationship tests
Merge pull request #2351 from jonathanKingston/model-relationships

Close #2350 Fixes generated model relationship tests