split parse to for agg and for calc, turns out aggregations are special, closes #325
fix test