Fix contact locator, add check assertions and complete test

This addresses the issue with the contact locator, adds some assertions to address false positives we were seeing before, and adds the final step to the test which was previously missed.

This passes on v1-train