Fixed test_connectivity vpn hybrid renaming leftovers