fix contacts unit tests for changes in how main address is derived.