I'm not going to replace all the test IPs, but where we're adding new ones... fair point ;)