Merge "Add a test to check if the VPN type is set or not" into sc-dev