ContactsModel micro changes and tests.