Fixed test.
Removed x/y from aggregator.
Generalizing 'diamond' into 'fan'