Merge "Fix unit test for apigateway"