Fix tests, add aggregation files