JASCIS110: Correct names in aggregation tests. Add GASSP aggregation test
Merge remote-tracking branch 'origin/devel' into devel