Merge "Port  API Test Enhancement"