Added some more tests
Merge branch 'feature/aggregates' into develop