refactor resource aggregations a bit to be more logical
add resource aggregation on per-report level; fix some tests; add test for sanity of test data