Add tests for statistic collections + grouped updates