Updates to contact and contact-test