Temporary UT fix for Contact matching