Fix contact locator, add check assertions and complete test