#694 Aggregation with large number of aggregation areas hangs - code compliance fixes for tests utilities.