Fixes for the contacts tests