Adjust association/navigability model and test to avoid circular
ownership.