Merge "Firewall as a service API Test Enhancement"