Finally fixed test aggregation?