Merge "VPNaaS API tests cleanup"