Merge "VPNaaS API Tests Enhancements"