Improve test to always consider local timezone