Fixes for aggregation tests - use user-extent