Fix faulty contact tests
Merge pull request #1567 from colemanw/master

Fix faulty contact tests