Further tuning on legacy API test scenarios