Add unit tests for Scale aggregator, fix a buglet.