Merge "Update test code to match new iptables behaviour."