Complex aggregation works, except to fix the all tests