Merge "Use assertEquals instead of assertTrue to compare the vpn type"