Fixed failing test for contact, removed incomplete and skipped