Added aggregates and some tests for irregular
Added aggregates and some tests for irregular