Close #2350 Fixes generated model relationship tests

This is one way of resolving this issue. The other would be to make the resolver allow for both cases in uses:[] which would probably be the better solution.
Will do, I'll add in the Changelog changes too