Merge "Fwaas API Test Enhancement"