Flesh out assertions on relationship related methods
Merge remote-tracking branch 'origin/master'