Reduce flakiness of GroupByEntityOutputSpec