Fix timezone in test timing
Merge pull request #3150 from yakky/feature/timezone_test

Fix timezone in test timing