Merge "Add unit tests related to data accounting for VPNs with one underlying network."