Refactor test
merge Fix time zone conversion