fixed aggregate measure tests
added popchart back with aggregate