fix tests to pass with 4.1
Merge branch 'fix/has-one-many' into 1.1
Merge branch '1.1'