Merge "Add testVpnTypesEqual to verify consistency"