[Fixed] test changes after timezone data changes
Merge pull request #1596 from LorenzoBoccaccia/aggregation-backport

[Fixed] test changes after timezone data changes