Fix incorrect assumption about argument type
Fix timezone bug, add test for timezone bug