test and fixes for Contact Custom Unique ID matching