Merge "Add unit tests for new VpnProfile fields"