Fixes contact test cases for enterprise perimeter

Fixes #474
Fixes #491