Merge "IP connectivity metrics: fix tests"