Tweaks for IP testing