Fix test and fix time zone