Merge pull request #546 from maspwr/refactor-relation-models

Move relation tests models into models.py
Merge remote-tracking branch 'upstream/master' into doubly-nested