relationships between model tests
Fixed merge conflict