Simplifies new RelationshipResolver
Updates Resolver Unit Tests