Split up the ambiguousAddRelationCheck method to make it easier to test
Added missing ambiguous relation tests and tests for new naming functionality