Added aggregate tests
something has gone horribly wrong
meh
merge merge
Merge branch 'horriblywrong'
Cleanup merge mess