remove empty test func
fix error handling
fix aggregations mapping