Issue #1105: Fix errors in unit tests caused by change to the new sort order of using the Primary Contact first.