Tweaks to IP testing