Merge "Update service test case - V3"