Final fix to contact tests, some tests in progress