Merge "Enhance v3 list_services to test filtering by service type"